3
0
Fork 0
forked from mirrors/linux
kernel/arch/s390
Paolo Abeni 941defcea7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

tools/testing/selftests/drivers/net/ping.py
  75cc19c8ff ("selftests: drv-net: add xdp cases for ping.py")
  de94e86974 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/20250311115758.17a1d414@canb.auug.org.au/

net/core/devmem.c
  a70f891e0f ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
  1d22d3060b ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/20250313114929.43744df1@canb.auug.org.au/

Adjacent changes:

tools/testing/selftests/net/Makefile
  6f50175cca ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
  2e5584e0f9 ("selftests/net: expand cmsg_ipv6.sh with ipv4")

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  661958552e ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
  fe96d717d3 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2025-03-13 23:08:11 +01:00
..
appldata treewide: const qualify ctl_tables where applicable 2025-01-28 13:48:37 +01:00
boot s390/boot: Fix ESSA detection 2025-02-18 18:49:24 +01:00
configs s390: Update defconfigs 2025-02-18 18:49:24 +01:00
crypto CRC updates for 6.14 2025-01-22 19:55:08 -08:00
hypfs [tree-wide] finally take no_llseek out 2024-09-27 08:18:43 -07:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-03-06 13:03:35 -08:00
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-03-13 23:08:11 +01:00
kvm KVM: s390: remove the last user of page->index 2025-01-31 12:03:53 +01:00
lib more s390 updates for 6.14 merge window 2025-01-30 10:48:17 -08:00
mm mm: hugetlb: Add huge page size param to huge_ptep_get_and_clear() 2025-02-27 17:40:57 +00:00
net s390/bpf: Implement exceptions 2024-07-08 16:39:35 +02:00
pci s390/pci: Fix handling of isolated VFs 2025-02-11 19:35:08 +01:00
purgatory s390/purgatory: Use -D__DISABLE_EXPORTS 2025-02-18 18:49:24 +01:00
tools s390/tools: Use array instead of string initializer 2025-01-28 15:12:06 +01:00
Kbuild
Kconfig more s390 updates for 6.14 merge window 2025-01-30 10:48:17 -08:00
Kconfig.debug
Makefile s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS 2025-01-28 09:49:35 +01:00
Makefile.postlink kbuild: Strip runtime const RELA sections correctly 2025-02-01 04:28:05 +09:00