tree 0925d65fb3e7e0eec9f6d08f22086a861d294dac
parent 109980b894e9dae66c37c3d804a415aa68b19c7e
parent 374fb014fc5b15e420faa00af036868a635eadd3
author David S. Miller <davem@davemloft.net> 1504930261 -0700
committer David S. Miller <davem@davemloft.net> 1504930261 -0700

Merge branch 'xdp-bpf-fixes'

John Fastabend says:

====================
net: Fixes for XDP/BPF

The following fixes, UAPI updates, and small improvement,

i. XDP needs to be called inside RCU with preempt disabled.

ii. Not strictly a bug fix but we have an attach command in the
sockmap UAPI already to avoid having a single kernel released with
only the attach and not the detach I'm pushing this into net branch.
Its early in the RC cycle so I think this is OK (not ideal but better
than supporting a UAPI with a missing detach forever).

iii. Final patch replace cpu_relax with cond_resched in devmap.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>