projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c2e6c9 1545dec)
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)
commit19d28fbd306e7ae7c1acf05c3e6968b56f0d196b
tree0584a3a4639424733bad7714796f858aa7addee7tree | snapshot
parent8c2e6c904fd8701a8d02d2bdb86871dc3ec4e85bcommit | diff
parent1545dec46db3858bbce84c2065b579e2925706abcommit | diff
Merge git://git./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 diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/wcn36xx/main.c diff1 | diff2 | blob | history
drivers/of/of_mdio.c diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
kernel/bpf/core.c diff1 | diff2 | blob | history
kernel/bpf/sockmap.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_align.c diff1 | diff2 | blob | history
John Crispins staging tree