review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 62e3a93 60b5482)

author	David S. Miller <davem@davemloft.net>
	Thu, 29 Nov 2018 06:10:54 +0000 (22:10 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 29 Nov 2018 06:10:54 +0000 (22:10 -0800)
commit	e561bb29b650d2817d10a4858f1817836ed08399
tree	0bc92b5bb8a287a8e4a88732f3c64b56d126da58	tree \| snapshot
parent	62e3a931788223048120357ab3f29dcb55c5ef79	commit \| diff
parent	60b548237fed4b4164bab13c994dd9615f6c4323	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

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

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/local_storage.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/Documentation/bpftool-map.rst	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/Documentation/bpftool-prog.rst	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/common.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/main.h	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/prog.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;