www.infradead.org Git - nvme.git/commit

]> www.infradead.org Git - nvme.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 27 Jun 2024 19:12:07 +0000 (12:12 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 27 Jun 2024 19:14:11 +0000 (12:14 -0700)
commit	193b9b200224dab4eaec407eb2955303a521f5b6
tree	95366182cc2871667a60613a921f7bfae0b9e2c7	tree
parent	cce346d441399209bd582f1aaf190a7784dd12f8	commit \| diff
parent	ffb7aa9fedad817b9fa0d868a3065c4eeb1f68c4	commit \| diff

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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:
e3f02f32a050 ("ionic: fix kernel panic due to multi-buffer handling")
d9c04209990b ("ionic: Mark error paths in the data path as unlikely")

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

21 files changed:

Documentation/netlink/specs/ethtool.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dma/ti/k3-udma-glue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/mana_en.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_txrx.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Documentation/netlink/specs/ethtool.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/dma/ti/k3-udma-glue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/mana_en.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_txrx.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history