linux/drivers/nfc/s3fwrn5
Jakub Kicinski b6e39e4846 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.0-rc8).

Conflicts:

net/ipv6/seg6_iptunnel.c
  c3812651b5 ("seg6: separate dst_cache for input and output paths in seg6 lwtunnel")
  78723a62b9 ("seg6: add per-route tunnel source address")
https://lore.kernel.org/adZhwtOYfo-0ImSa@sirena.org.uk

net/ipv4/icmp.c
  fde29fd934 ("ipv4: icmp: fix null-ptr-deref in icmp_build_probe()")
  d98adfbdd5 ("ipv4: drop ipv6_stub usage and use direct function calls")
https://lore.kernel.org/adO3dccqnr6j-BL9@sirena.org.uk

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/chain_mode.c
  51f4e090b9 ("net: stmmac: fix integer underflow in chain mode")
  6b4286e055 ("net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-04-09 13:20:59 -07:00
..
core.c nfc: Correct Samsung "Electronics" spelling in copyright headers 2025-05-21 20:31:18 -07:00
firmware.c NFC: s3fwrn5: Replace strcpy() with strscpy() 2026-03-03 17:13:18 -08:00
firmware.h nfc: Correct Samsung "Electronics" spelling in copyright headers 2025-05-21 20:31:18 -07:00
i2c.c nfc: s3fwrn5: convert to gpio descriptors 2026-03-09 10:25:34 +01:00
Kconfig nfc: s3fwrn5: Use SHA-1 library instead of crypto_shash 2025-08-18 17:29:08 -07:00
Makefile nfc: s3fwrn5: Support a UART interface 2020-12-02 17:55:25 -08:00
nci.c nfc: Correct Samsung "Electronics" spelling in copyright headers 2025-05-21 20:31:18 -07:00
nci.h nfc: Correct Samsung "Electronics" spelling in copyright headers 2025-05-21 20:31:18 -07:00
phy_common.c nfc: s3fwrn5: convert to gpio descriptors 2026-03-09 10:25:34 +01:00
phy_common.h nfc: s3fwrn5: convert to gpio descriptors 2026-03-09 10:25:34 +01:00
s3fwrn5.h nfc: Correct Samsung "Electronics" spelling in copyright headers 2025-05-21 20:31:18 -07:00
uart.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-04-09 13:20:59 -07:00