git.itanic.dy.fi Git - linux-stable/commit

]> git.itanic.dy.fi Git - linux-stable/commit

author	Jakub Kicinski <kuba@kernel.org>
	Fri, 5 Jan 2024 02:04:58 +0000 (18:04 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Fri, 5 Jan 2024 02:06:46 +0000 (18:06 -0800)
commit	e63c1822ac32a865dd02a18107fc933fd7b30f6f
tree	3d3875012e8412080a5ecc5f71d8f7e849bd4a95	tree \| snapshot
parent	a180b0b1a6c484a091f2f20f9c6b9e5e726cbd31	commit \| diff
parent	1f874787ed9a2d78ed59cb21d0d90ac0178eceb0	commit \| diff

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/

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

30 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/npc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp_ao.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_diag.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/npc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp_ao.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_diag.c	diff1 \|	diff2 \|	blob \| history