linux/arch
Jakub Kicinski 8d72997dab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.1-rc7).

Silent conflicts:

net/wireless/nl80211.c
  cb9959ab5f ("wifi: cfg80211: enforce HE/EHT cap/oper consistency")
  a384ae9699 ("wifi: cfg80211: move AP HT/VHT/... operation to beacon info")
https://lore.kernel.org/aiGJDaHV4UlCexIQ@sirena.org.uk

Conflicts:

drivers/net/wireless/intel/iwlwifi/mld/ap.c
  a342c99cb7 ("wifi: iwlwifi: mld: honor BSS_CHANGED_BEACON_ENABLED")
  9bf1b409af ("wifi: iwlwifi: mld: send tx power constraints before link activation")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

drivers/net/wireless/intel/iwlwifi/pcie/drv.c
  093305d801 ("wifi: iwlwifi: pcie: simplify the resume flow if fast resume is not used")
  e2323929a6 ("wifi: iwlwifi: pcie: add debug print for resume flow if powered off")
https://lore.kernel.org/ah2bfedhV45ZxMO8@sirena.org.uk

Adjacent changes:

drivers/net/ethernet/airoha/airoha_eth.c
  b38cae85d1 ("net: airoha: Fix use-after-free in metadata dst teardown")
  ec6c391bcc ("net: airoha: Introduce airoha_gdm_dev struct")

drivers/net/ethernet/microchip/lan743x_main.c
  8173d22b21 ("net: lan743x: permit VLAN-tagged packets up to configured MTU")
  e3c6508a46 ("net: lan743x: avoid netdev-based logging before netdev registration")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
History 2026-06-04 15:29:04 -07:00
..
alpha ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
arc ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-06-04 15:29:04 -07:00
arm64 soc: fixes for 7.1, part 2 2026-06-02 10:54:11 -07:00
csky ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
hexagon ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
loongarch LoongArch fixes for v7.1-rc5 2026-05-23 09:13:00 -07:00
m68k ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
microblaze ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
mips Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-06-04 15:29:04 -07:00
nios2 NIOS2: updates for v7.2 2026-05-23 09:21:08 -07:00
openrisc ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
parisc ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
powerpc Including fixes from Bluetooth, wireless and netfilter. 2026-05-21 14:39:12 -07:00
riscv Clang build fixes for 7.1 #2 2026-05-29 15:17:53 -07:00
s390 s390 updates for 7.1-rc7 2026-06-04 12:31:20 -07:00
sh ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
sparc ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
um ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
x86 Miscellaneous x86 fixes: 2026-05-31 08:52:16 -07:00
xtensa ring-buffer: Flush and stop persistent ring buffer on panic 2026-05-21 08:20:58 -04:00
.gitignore .gitignore: prefix local generated files with a slash 2021-05-02 00:43:35 +09:00
Kconfig parisc architecture fixes and updates for kernel v7.1-rc1: 2026-04-18 11:37:36 -07:00