OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e54b3c f335195)
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)
commit51e18a453f5f59a40c721d4aeab082b4e2e9fac6
tree540d37e6f7a83466677ab6095fcdd2d6f72583c4tree | snapshot
parent5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4commit | diff
parentf335195adf043168ee69d78ea72ac3e30f0c57cecommit | 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
This is a test repository.
About OSDN
Find Software
Develop Software
Help