mirror_ubuntu-kernels/drivers/net/wireless/intel
Jakub Kicinski e63c1822ac 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
  e009b2efb7 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
  0f2b214779 ("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>
2024-01-04 18:06:46 -08:00
..
ipw2x00 wifi: ipw2x00: replace deprecated strncpy with strscpy_pad 2023-10-23 20:26:29 +03:00
iwlegacy wifi: iwlegacy: Add null pointer check to il_leds_init() 2023-12-12 17:35:20 +02:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-01-04 18:06:46 -08:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile iwlwifi: fix build error for IWLMEI 2022-03-02 22:36:49 +01:00