]> 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)
commit871987385ae0ba21c833124e7ab33d29ef51a24a
tree0584a3a4639424733bad7714796f858aa7addee7
parent9d4f3127544b909bed4e04545d13de18a80f800c
parent27976042326c0177915d1835991cf95b1c2f389a
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