mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
c7815abbea457afa2a1ab3ded46d29c19da377d2
linux/drivers/soc
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
..
amlogic
pmdomain: amlogic: Move Kconfig options to the pmdomain subsystem
2023-09-20 10:08:45 +02:00
apple
soc: apple: mailbox: error pointers are negative integers
2024-01-30 11:34:49 -08:00
aspeed
soc/aspeed: Convert to platform remove callback returning void
2023-10-13 15:04:12 +10:30
atmel
soc: microchip: Explicitly include correct DT includes
2023-07-29 16:54:29 +03:00
bcm
Merge tag 'soc-drivers-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2023-11-01 14:46:51 -10:00
canaan
soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
2024-04-05 16:42:50 +01:00
dove
soc: dove: add missing of_node_put
2023-09-20 11:28:02 +02:00
fsl
dim: make DIMLIB dependent on NET
2024-06-25 17:15:06 -07:00
fujitsu
soc/fujitsu: a64fx-diag: Convert to platform remove callback returning void
2023-10-14 23:27:01 +02:00
gemini
…
hisilicon
soc: hisilicon: kunpeng_hccs: replace MAILBOX dependency with PCC
2024-04-25 02:09:46 +00:00
imx
Merge tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
2023-11-01 13:09:46 -10:00
ixp4xx
soc/ixp4xx: ixp4xx-qmgr: Convert to platform remove callback returning void
2023-10-14 23:27:13 +02:00
lantiq
…
litex
drivers/soc/litex: drop obsolete dependency on COMPILE_TEST
2024-06-27 16:33:39 +02:00
loongson
Merge tag 'platform-remove-void-soc-for-6.7-rc' of https://git.pengutronix.de/git/ukl/linux into soc/drivers
2023-10-16 22:51:31 +02:00
mediatek
Merge tag 'soc-drivers-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2024-05-13 08:48:42 -07:00
microchip
soc: microchip: Fix POLARFIRE_SOC_SYS_CTRL input prompt
2024-01-22 16:39:40 +00:00
nuvoton
soc: nuvoton: Add SoC info driver for WPCM450
2023-02-01 17:11:36 +01:00
pxa
spi: pxa2xx: Use proper SSP header in soc/pxa/ssp.c
2024-03-25 00:49:17 +00:00
qcom
tracing/treewide: Remove second parameter of __assign_str()
2024-05-22 20:14:47 -04:00
renesas
soc: renesas: Enable TMU support on R-Car Gen2
2024-03-26 09:25:06 +01:00
rockchip
Merge tag 'soc-drivers-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2023-11-01 14:46:51 -10:00
samsung
soc: samsung: exynos-asv: Update Energy Model after adjusting voltage
2024-04-08 16:05:15 +02:00
sunxi
soc: sunxi: sram: export register 0 for THS on H616
2024-03-11 17:14:46 +01:00
tegra
mm/util: Swap kmemdup_array() arguments
2024-06-06 08:55:20 -07:00
ti
soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message
2024-04-09 11:11:59 -05:00
ux500
ARM: ux500: do not directly dereference __iomem
2022-11-08 21:13:56 +01:00
versatile
…
xilinx
Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2024-01-17 16:47:17 -08:00
Kconfig
soc: sifive: shunt ccache driver to drivers/cache
2023-11-22 11:49:25 +00:00
Makefile
soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
2024-04-05 16:42:50 +01:00