Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Sun, 14 Oct 2018 20:01:20 +0000 (13:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 14 Oct 2018 20:01:20 +0000 (13:01 -0700)
commit028c99fa912b4ad2174793da97694a9c4b2cd305
tree43d8bcccc596a098f490c6e244fd0350750d7886
parentbab5c80b211035739997ebd361a679fa85b39465
parentcee271678d0e3177a25d0fcb2fa5e051d48e4262
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2018-10-14

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix xsk map update and delete operation to not call synchronize_net()
   but to piggy back on SOCK_RCU_FREE for sockets instead as we are not
   allowed to sleep under RCU, from Bj√∂rn.

2) Do not change RLIMIT_MEMLOCK in reuseport_bpf selftest if the process
   already has unlimited RLIMIT_MEMLOCK, from Eric.
====================

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