mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
aba43bdfdccf15da1dfdc657bd9dada9010d77a4
linux/arch/arm
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
  219343755e ("net: phy: aquantia: add missing include guards")
  61578f6793 ("net: phy: aquantia: add support for PHY LEDs")

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

include/linux/mlx5/mlx5_ifc.h
  048a403648 ("net/mlx5: IFC updates for changing max EQs")
  99be56171f ("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
  4130c67cd1 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f3126515f ("wifi: iwlwifi: mvm: add mvm-specific guard")

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-07-04 14:16:11 -07:00
..
boot
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
common
locomo: make locomo_bus_type constant and static
2024-01-04 14:38:57 +01:00
configs
Merge tag 'usb-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2024-05-22 11:40:09 -07:00
crypto
crypto: arm/sha - fix function cast warnings
2024-02-24 08:41:19 +08:00
include
efi/arm: Disable LPAE PAN when calling EFI runtime services
2024-06-15 10:25:02 +02:00
kernel
ARM: 9405/1: ftrace: Don't assume stack frames are contiguous in memory
2024-06-10 12:00:27 +01:00
lib
ARM: crypto: use CC_FLAGS_FPU for NEON CFLAGS
2024-05-19 14:36:17 -07:00
mach-actions
…
mach-alpine
…
mach-artpec
…
mach-aspeed
…
mach-at91
ARM: at91: pm: set soc_pm.data.mode in at91_pm_secure_init()
2023-11-19 11:32:44 +02:00
mach-axxia
…
mach-bcm
ARM: bcm: stop selecing CONFIG_TICK_ONESHOT
2024-02-28 10:32:25 -08:00
mach-berlin
…
mach-clps711x
…
mach-davinci
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
2024-01-17 11:34:45 -08:00
mach-digicolor
…
mach-dove
…
mach-ep93xx
ARM: ep93xx: Add terminator to gpiod_lookup_table
2024-02-20 17:19:49 +01:00
mach-exynos
…
mach-footbridge
…
mach-gemini
…
mach-highbank
…
mach-hisi
…
mach-hpe
…
mach-imx
ARM: imx: Assign parents for mmdc event_source devices
2024-04-22 13:41:58 +08:00
mach-ixp4xx
…
mach-keystone
…
mach-lpc18xx
…
mach-lpc32xx
…
mach-mediatek
…
mach-meson
…
mach-milbeaut
…
mach-mmp
…
mach-mstar
…
mach-mv78xx0
…
mach-mvebu
ARM: mvebu: Explicitly include correct DT includes
2023-08-12 10:31:00 +02:00
mach-mxs
ARM: mxs: Do not search for "fsl,clkctrl"
2023-12-06 11:21:43 +08:00
mach-nomadik
…
mach-npcm
…
mach-omap1
ARM: omap1: remove duplicated 'select ARCH_OMAP'
2024-02-28 09:27:20 +02:00
mach-omap2
Merge tag 'omap-for-v6.9/n8x0-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
2024-04-09 16:17:37 +02:00
mach-orion5x
ARM: orion5x: Convert TS409 board to GPIO descriptors for LEDs
2024-05-05 18:18:18 +02:00
mach-pxa
Merge tag 'gpio-updates-for-v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
2024-05-14 15:07:07 -07:00
mach-qcom
ARM: qcom: merge remaining subplatforms into sensible Kconfig entry
2024-02-06 15:00:02 -06:00
mach-realtek
…
mach-rockchip
ARM: rockchip: Drop unused includes
2023-08-12 10:31:00 +02:00
mach-rpc
…
mach-s3c
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
2024-05-10 04:34:52 +09:00
mach-s5pv210
ARM: s5pv210: fix pm.c kernel-doc warning
2024-01-22 11:44:16 +01:00
mach-sa1100
ARM: sa1100: Open code gpio_request_array()
2024-04-03 13:07:29 +02:00
mach-shmobile
ARM: shmobile: sh73a0: Reserve boot area when SMP is enabled
2023-09-27 11:00:27 +02:00
mach-socfpga
…
mach-spear
ARM: spear: Explicitly include correct DT includes
2023-08-12 10:31:01 +02:00
mach-sti
…
mach-stm32
firewall: introduce stm32_firewall framework
2024-04-05 16:49:14 +02:00
mach-sunxi
ARM: sun9i: smp: fix return code check of of_property_match_string
2024-01-02 16:45:16 +01:00
mach-tegra
…
mach-ux500
…
mach-versatile
ARM: Delete ARM11MPCore (ARM11 ARMv6K SMP) support
2023-12-22 11:43:16 +00:00
mach-vt8500
…
mach-zynq
ARM: zynq: Remove clk/zynq.h header
2024-01-22 14:22:10 +01:00
mm
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-05-02 12:06:25 -07:00
nwfpe
…
plat-orion
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
2024-05-10 04:34:52 +09:00
probes
…
tools
mseal: wire up mseal syscall
2024-05-23 19:40:26 -07:00
vdso
Makefile: remove redundant tool coverage variables
2024-05-14 23:35:48 +09:00
vfp
ARM: 9327/1: vfp: Add missing VFP instructions to neon_support_hook
2023-12-05 11:40:27 +00:00
xen
arm/xen: fix xen_vcpu_info allocation alignment
2023-11-23 09:32:41 +01:00
Kbuild
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
2024-05-10 04:34:52 +09:00
Kconfig
Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-05-19 09:21:03 -07:00
Kconfig-nommu
…
Kconfig.assembler
…
Kconfig.debug
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
2024-03-23 09:17:03 -07:00
Kconfig.platforms
ARM: mach-nspire: Rework support and directory structure
2023-12-22 14:23:30 +00:00
Makefile
ARM: implement ARCH_HAS_KERNEL_FPU_SUPPORT
2024-05-19 14:36:17 -07:00