git.ipfire.org Git - thirdparty/linux.git/commit

]> git.ipfire.org Git - thirdparty/linux.git/commit

projects / thirdparty / linux.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 27 Nov 2025 20:16:40 +0000 (12:16 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 27 Nov 2025 20:19:08 +0000 (12:19 -0800)
commit	db4029859d6fd03f0622d394f4cdb1be86d7ec62
tree	e2e33b9c1f6bb9aea36df6ce974d698f0aaf177c	tree \| snapshot
parent	73f784b2c938e17e4af90aff4cdcaafe4ca06a5f	commit \| diff
parent	1f5e808aa63af61ec0d6a14909056d6668813e86	commit \| diff

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

Conflicts:

net/xdp/xsk.c
  0ebc27a4c67d ("xsk: avoid data corruption on cq descriptor number")
  8da7bea7db69 ("xsk: add indirect call for xsk_destruct_skb")
  30ed05adca4a ("xsk: use a smaller new lock for shared pool case")
https://lore.kernel.org/20251127105450.4a1665ec@canb.auug.org.au
https://lore.kernel.org/eb4eee14-7e24-4d1b-b312-e9ea738fefee@kernel.org

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

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/rcar/rcar_canfd.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/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/meta/fbnic/fbnic_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mxl-gpy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/veth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
fs/smb/client/connect.c	diff1 \|	diff2 \|	blob \| history
net/atm/common.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/iso.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/can/rcar/rcar_canfd.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/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/meta/fbnic/fbnic_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mxl-gpy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/veth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
fs/smb/client/connect.c	diff1 \|	diff2 \|	blob \| history
net/atm/common.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/iso.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history