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

..

allwinner

Merge tag 'v6.9-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-03-15 14:46:54 -07:00

amcc

…

amlogic

…

aspeed

…

axis

…

bcm

crypto: bcm - Fix pointer arithmetic

2024-04-02 10:49:39 +08:00

caam

crypto: caam: Unembed net_dev structure in dpaa2

2024-07-04 10:19:24 -07:00

cavium

…

ccp

Merge tag 'v6.10-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-05-13 14:53:05 -07:00

ccree

…

chelsio

…

gemini

…

hisilicon

crypto: hisilicon/sec2 - fix for register offset

2024-05-03 18:44:44 +08:00

inside-secure

…

intel

Merge tag 'v6.10-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-06-27 17:43:15 -07:00

marvell

Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2024-05-14 19:42:24 -07:00

nx

crypto: nx - Avoid -Wflex-array-member-not-at-end warning

2024-04-02 10:49:38 +08:00

qce

…

rockchip

Merge tag 'v6.9-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-03-15 14:46:54 -07:00

starfive

crypto: starfive - Use fallback for unaligned dma access

2024-05-10 17:15:24 +08:00

stm32

crypto: stm32/hash - add full DMA support for stm32mpx

2024-04-19 18:54:19 +08:00

tegra

crypto: tegra - Fix some error codes

2024-04-26 17:26:09 +08:00

virtio

crypto: virtio - drop owner assignment

2024-05-22 08:31:16 -04:00

xilinx

…

atmel-aes-regs.h

…

atmel-aes.c

…

atmel-authenc.h

…

atmel-ecc.c

…

atmel-i2c.c

crypto: atmel-sha204a - add reading from otp zone

2024-05-10 17:15:25 +08:00

atmel-i2c.h

crypto: atmel-sha204a - add reading from otp zone

2024-05-10 17:15:25 +08:00

atmel-sha204a.c

crypto: atmel-sha204a - provide the otp content

2024-05-10 17:15:25 +08:00

atmel-sha-regs.h

…

atmel-sha.c

…

atmel-tdes-regs.h

…

atmel-tdes.c

…

exynos-rng.c

…

geode-aes.c

…

geode-aes.h

…

hifn_795x.c

…

img-hash.c

…

Kconfig

Merge tag 'v6.10-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2024-05-13 14:53:05 -07:00

Makefile

crypto: tegra - Add Tegra Security Engine driver

2024-04-12 15:07:51 +08:00

mxs-dcp.c

crypto: mxs-dcp: Add support for hardware-bound keys

2024-05-09 18:29:03 +03:00

n2_asm.S

…

n2_core.c

…

n2_core.h

…

omap-aes-gcm.c

…

omap-aes.c

…

omap-aes.h

…

omap-crypto.c

…

omap-crypto.h

…

omap-des.c

…

omap-sham.c

…

padlock-aes.c

…

padlock-sha.c

…

qcom-rng.c

…

s5p-sss.c

…

sa2ul.c

…

sa2ul.h

…

sahara.c

crypto: sahara - use 'time_left' variable with wait_for_completion_timeout()

2024-05-10 17:15:25 +08:00

talitos.c

…

talitos.h

…