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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 5e54b3c f335195)

author	David S. Miller <davem@davemloft.net>
	Sun, 10 Dec 2017 03:09:55 +0000 (22:09 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sun, 10 Dec 2017 03:09:55 +0000 (22:09 -0500)
commit	51e18a453f5f59a40c721d4aeab082b4e2e9fac6
tree	540d37e6f7a83466677ab6095fcdd2d6f72583c4	tree \| snapshot
parent	5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4	commit \| diff
parent	f335195adf043168ee69d78ea72ac3e30f0c57ce	commit \| diff

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

Conflict was two parallel additions of include files to sch_generic.c,
no biggie.

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

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/thunder/nicvf_queues.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_generic.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/Makefile	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel; Licenses: GPL-2.0;