]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Jan 2018 02:27:54 +0000 (21:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Jan 2018 03:13:42 +0000 (22:13 -0500)
commit96311a2483afd5ce8cfe4956d86fcb66fdb396da
tree0584a3a4639424733bad7714796f858aa7addee7
parent4a0f3f181a203c2c3f2361c7b5c4d6e8d9ffcc15
parent40c67ccf1e79622dc5a1fa07f21b3f01eb32180f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

BPF alignment tests got a conflict because the registers
are output as Rn_w instead of just Rn in net-next, and
in net a fixup for a testcase prohibits logical operations
on pointers before using them.

Also, we should attempt to patch BPF call args if JIT always on is
enabled.  Instead, if we fail to JIT the subprogs we should pass
an error back up and fail immediately.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/wireless/ath/wcn36xx/main.c
drivers/of/of_mdio.c
include/linux/bpf.h
kernel/bpf/core.c
kernel/bpf/sockmap.c
kernel/bpf/verifier.c
net/core/filter.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_output.c
net/sctp/socket.c
net/socket.c
tools/testing/selftests/bpf/test_align.c