www.infradead.org Git - users/hch/dma-mapping.git/commit

]> www.infradead.org Git - users/hch/dma-mapping.git/commit

projects / users / hch / dma-mapping.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Sat, 28 Nov 2020 02:25:27 +0000 (18:25 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Sat, 28 Nov 2020 02:25:27 +0000 (18:25 -0800)
commit	5c39f26e67c984db0fa95f9faecf06eb0198dce7
tree	821aaa43d3f5806134438daa531be6d171292c5f	tree
parent	6375da9dac8bec05a022f22ab22300cc824ec268	commit \| diff
parent	c84e1efae022071a4fcf9f1899bf71777c49943a	commit \| diff

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

Trivial conflict in CAN, keep the net-next + the byteswap wrapper.

Conflicts:
drivers/net/can/usb/gs_usb.c

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/m_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc_qos.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/intel/i40e/i40e_virtchnl_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/nfc/s3fwrn5/i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/m_can/m_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc_qos.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/intel/i40e/i40e_virtchnl_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/nfc/s3fwrn5/i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history