git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 6 Apr 2017 14:25:07 +0000 (07:25 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 6 Apr 2017 15:24:51 +0000 (08:24 -0700)
commit	6f14f443d3e773439fb9cc6f2685ba90d5d026c5
tree	d45c11bba3458a805c4ac766ac85ebcf3c00b1eb	tree \| snapshot (tar.gz zip)
parent	faeeb317a5615076dff1ff44b51e862e6064dbd0	commit \| diff
parent	ea6b1720ce25f92f7a17b2e0c2b653d20773d10a	commit \| diff

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

Mostly simple cases of overlapping changes (adding code nearby,
a function whose name changes, for example).

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

26 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ezchip/nps_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/secure_seq.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_snmp_basic.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_cttimeout.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/sctp/stream.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ezchip/nps_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/secure_seq.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_snmp_basic.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_cttimeout.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/sctp/stream.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history