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>
	Fri, 10 Nov 2017 01:00:18 +0000 (10:00 +0900)
committer	David S. Miller <davem@davemloft.net>
	Fri, 10 Nov 2017 01:00:18 +0000 (10:00 +0900)
commit	4dc6758d7824a6d25717ccceefc488cafdb07210
tree	992e5d5996910af35a5c12fe94da14d0bb167452	tree \| snapshot
parent	19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8	commit \| diff
parent	3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

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

29 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvpp2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/act_api.h	diff1 \|	diff2 \|	blob \| history
include/net/pkt_cls.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/qrtr/qrtr.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_bpf.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_basic.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flow.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_fw.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_matchall.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_tcindex.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_u32.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.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/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvpp2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/act_api.h	diff1 \|	diff2 \|	blob \| history
include/net/pkt_cls.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/qrtr/qrtr.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_bpf.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_basic.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_bpf.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flow.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_fw.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_matchall.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_tcindex.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_u32.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history