git.ipfire.org Git - thirdparty/kernel/stable.git/commit

]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit

projects / thirdparty / kernel / stable.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
committer	David S. Miller <davem@davemloft.net>
	Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
commit	60747ef4d173c2747bf7f0377fb22846cb422195
tree	ea0faf33b952495c47909be1400c475a3f3821b0	tree \| snapshot
parent	484334198f8ce9552e20930fff9408ebf6bcf94d	commit \| diff
parent	184ca823481c99dadd7d946e5afd4bb921eab30d	commit \| 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

Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git

RSS Atom

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