Jakub Kicinski 41e3ddb291 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

include/trace/events/rpcgss.h
  386f4a7379 ("trace: events: cleanup deprecated strncpy uses")
  a4833e3aba ("SUNRPC: Fix rpcgss_context trace event acceptor field")

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_tc_lib.c
  2cca35f5dd ("ice: Fix checking for unsupported keys on non-tunnel device")
  784feaa65d ("ice: Add support for PFCP hardware offload in switchdev")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-04-18 13:12:24 -07:00

..

alpha

Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-03-21 14:41:00 -07:00

arc

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

arm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-18 13:12:24 -07:00

arm64

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-18 13:12:24 -07:00

csky

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

hexagon

hexagon: vmlinux.lds.S: handle attributes section

2024-03-26 11:07:23 -07:00

loongarch

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-11 14:23:47 -07:00

m68k

Merge tag 'tty-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2024-03-21 12:44:10 -07:00

microblaze

arch: define CONFIG_PAGE_SIZE_*KB on all architectures

2024-03-06 19:29:09 +01:00

mips

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-18 13:12:24 -07:00

nios2

nios2: Only use built-in devicetree blob if configured to do so

2024-04-03 14:35:53 -05:00

openrisc

Merge tag 'for-linus' of https://github.com/openrisc/linux

2024-03-14 15:53:10 -07:00

parisc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-03-28 17:25:57 -07:00

powerpc

vdso: Use CONFIG_PAGE_SHIFT in vdso/datapage.h

2024-04-03 21:50:04 +02:00

riscv

Merge tag 'riscv-for-linus-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2024-04-05 13:09:48 -07:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-11 14:23:47 -07:00

sh

Merge tag 'sh-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

2024-03-21 10:13:47 -07:00

sparc

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2024-03-27 07:52:34 -07:00

um

Merge tag 'devicetree-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2024-03-15 12:37:59 -07:00

x86

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-18 13:12:24 -07:00

xtensa

Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2024-03-14 17:43:30 -07:00

.gitignore

…

Kconfig

Kconfig: add some hidden tabs on purpose

2024-04-12 10:05:10 -07:00