git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 2 Sep 2019 18:20:17 +0000 (11:20 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 2 Sep 2019 18:20:17 +0000 (11:20 -0700)
commit	73f9741664cd21971b114701d93d726e8ad0549e
tree	4387f5034f870accfd2bb56997c535159da45f06	tree \| snapshot
parent	98527447963e197d913e9a137b24c9ea1c5adb6a	commit \| diff
parent	8a9d99520c17c557e8eba8e3fb857089f0033021	commit \| diff

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

r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next

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

24 files changed:

Documentation/devicetree/bindings/net/dsa/ksz.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_ogm.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_8021q.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_standalone.c	diff1 \|	diff2 \|	blob \| history
net/rds/recv.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_object.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/rxkad.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_vlan.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_taprio.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/devicetree/bindings/net/dsa/ksz.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_ogm.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_8021q.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_standalone.c	diff1 \|	diff2 \|	blob \| history
net/rds/recv.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_object.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/rxkad.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_vlan.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_taprio.c	diff1 \|	diff2 \|	blob \| history