]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecae2c7 57c37ef)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 10 Dec 2017 03:09:55 +0000 (22:09 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Dec 2017 03:09:55 +0000 (22:09 -0500)
commit815d420f14b867a58e7bbc2c87d4b77461b663b7
tree540d37e6f7a83466677ab6095fcdd2d6f72583c4tree | snapshot
parentecae2c7849d0d51b11052e2311da1e9823ccf5ebcommit | diff
parent57c37efd3336aab13e9a5c30f48b8c94de5d6353commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.