iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch
History
Jakub Kicinski 76ed626479 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/aquantia/aquantia.h
  219343755eae ("net: phy: aquantia: add missing include guards")
  61578f679378 ("net: phy: aquantia: add support for PHY LEDs")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  bd07a9817846 ("net: txgbe: remove separate irq request for MSI and INTx")
  b501d261a5b3 ("net: txgbe: add FDIR ATR support")
https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/

include/linux/mlx5/mlx5_ifc.h
  048a403648fc ("net/mlx5: IFC updates for changing max EQs")
  99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO")
https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/

Adjacent changes:

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
  4130c67cd123 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f3126515fbe ("wifi: iwlwifi: mvm: add mvm-specific guard")

include/net/mac80211.h
  816c6bec09ed ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP")
  5a009b42e041 ("wifi: mac80211: track changes in AP's TPE")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-07-04 14:16:11 -07:00
..
alpha
mseal: wire up mseal syscall
2024-05-23 19:40:26 -07:00
arc
bpf-for-netdev
2024-05-27 16:26:30 -07:00
arm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
arm64
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
csky
syscalls: mmap(): use unsigned offset type consistently
2024-06-25 15:57:38 +02:00
hexagon
hexagon: fix fadvise64_64 calling conventions
2024-06-25 15:57:37 +02:00
loongarch
syscalls: mmap(): use unsigned offset type consistently
2024-06-25 15:57:38 +02:00
m68k
mseal: wire up mseal syscall
2024-05-23 19:40:26 -07:00
microblaze
syscalls: mmap(): use unsigned offset type consistently
2024-06-25 15:57:38 +02:00
mips
syscalls: fix compat_sys_io_pgetevents_time64 usage
2024-06-25 15:57:20 +02:00
nios2
Kbuild updates for v6.10
2024-05-18 12:39:20 -07:00
openrisc
openrisc: Move FPU state out of pt_regs
2024-04-15 15:20:39 +01:00
parisc
parisc: use generic sys_fanotify_mark implementation
2024-06-25 15:57:25 +02:00
powerpc
powerpc: restore some missing spu syscalls
2024-06-25 15:57:26 +02:00
riscv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
s390
s390 fixes for 6.10-rc7
2024-07-04 09:46:15 -07:00
sh
sh: rework sync_file_range ABI
2024-06-25 15:57:26 +02:00
sparc
sparc: fix compat recv/recvfrom syscalls
2024-06-25 15:57:25 +02:00
um
This pull request contains the following changes for UML:
2024-05-25 13:17:48 -07:00
x86
x86-32: fix cmpxchg8b_emu build error with clang
2024-06-30 09:21:29 -07:00
xtensa
mseal: wire up mseal syscall
2024-05-23 19:40:26 -07:00
.gitignore
…
Kconfig
Revert "mm: mmap: allow for the maximum number of bits for randomizing mmap_base by default"
2024-06-17 12:57:03 -07:00