]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef37887 4b1fefd)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
commit037725d2c12db30df25d46019846feff3bf7e3d8
treeea0faf33b952495c47909be1400c475a3f3821b0tree | snapshot
parentef3788761164894de48f564cd2bea57ef6ecfb94commit | diff
parent4b1fefd2a7086a974eb18ca6c7928baf2e9cb216commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dcbx.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/hyperv/hyperv_net.h diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
fs/proc/proc_sysctl.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/qed/qed_if.h diff1 | diff2 | blob | history
include/net/gre.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv6/ip6_gre.c diff1 | diff2 | blob | history
samples/bpf/bpf_helpers.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.