git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 3 Dec 2020 23:42:13 +0000 (15:42 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 3 Dec 2020 23:44:09 +0000 (15:44 -0800)
commit	55fd59b003f6e8fd88cf16590e79823d7ccf3026
tree	f23b2225f1a00b80632d612428708d5a57ad330b	tree
parent	a4390e966f952510808b10ce7ae2a7dd2a08c0e5	commit \| diff
parent	bbe2ba04c5a92a49db8a42c850a5a2f6481e47eb	commit \| diff

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

Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

28 files changed:

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/kvaser_pciefd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/tcan4x5x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sun4i_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history
net/x25/af_x25.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/btf.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/c_can/c_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/kvaser_pciefd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/tcan4x5x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sun4i_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history
net/x25/af_x25.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/btf.c	diff1 \|	diff2 \|	blob \| history