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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/ip_gre.c
  17af420545 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a77d ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/

Adjacent changes:

net/ipv6/ip6_fib.c
  d21d40605b ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320c1 ("ipv6: remove RTNL protection from inet6_dump_fib()")

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

2024-04-04 18:01:07 -07:00

..

alchemy

MIPS: Alchemy: Use kcalloc() instead of kzalloc()

2024-02-20 13:36:34 +01:00

ath25

MIPS: ath25: Constify static irq_domain_ops

2022-02-22 09:39:03 +01:00

ath79

MIPS: ath79: remove obsolete ATH79_DEV_* configs

2023-03-17 10:28:04 +01:00

bcm47xx

MIPS: Fix typos

2024-01-08 10:39:12 +01:00

bcm63xx

MIPS: BCM63XX: Fix missing prototypes

2024-01-26 10:33:20 +01:00

bmips

MIPS: Explicitly include correct DT includes

2023-07-25 10:42:01 +02:00

boot

mips: dts: ralink: mt7621: add cell count properties to usb

2024-03-11 13:58:35 +01:00

cavium-octeon

Merge tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2024-01-17 11:20:50 -08:00

cobalt

MIPS: Cobalt: Fix missing prototypes

2024-01-22 10:32:21 +01:00

configs

MIPS: Add support for Mobileye EyeQ5

2024-02-20 13:36:34 +01:00

crypto

crypto: mips/crc32 - remove redundant setting of alignmask to 0

2023-10-27 18:04:24 +08:00

dec

MIPS: fix typos in comments

2022-05-04 22:22:59 +02:00

fw

MIPS: fw arc: Fix missing prototypes

2024-01-22 11:12:01 +01:00

generic

MIPS: Share generic kernel code with other architecture

2024-02-20 13:36:25 +01:00

include

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2024-03-15 13:03:13 -07:00

ingenic

MIPS: Kconfig: ingenic: Ensure MACH_INGENIC_GENERIC selects all SoCs

2021-06-01 11:44:47 +02:00

jazz

vgacon, arch/*: remove unused screen_info definitions

2023-10-17 10:17:02 +02:00

kernel

Merge tag 'mips_6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2024-03-15 12:44:32 -07:00

kvm

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2024-03-15 13:03:13 -07:00

lantiq

MIPS: lantiq: register smp_ops on non-smp platforms

2024-01-26 10:36:21 +01:00

lib

mips: implement xor_unlock_is_negative_byte

2023-10-18 14:34:17 -07:00

loongson2ef

MIPS: Fix typos

2024-01-08 10:39:12 +01:00

loongson32

MIPS: loongson32: Remove dma.h and nand.h

2023-10-06 10:10:13 +02:00

loongson64

mm: Introduce vmap_page_range() to map pages in PCI address space

2024-03-11 16:58:10 +01:00

math-emu

MIPS: Fix comment typo

2022-09-12 15:33:24 +02:00

mm

MIPS: tlbex: Use GPR number macros

2024-02-20 12:41:52 +01:00

mobileye

MIPS: Add support for Mobileye EyeQ5

2024-02-20 13:36:34 +01:00

mti-malta

vgacon: clean up global screen_info instances

2023-10-17 10:17:02 +02:00

n64

mips: Add N64 machine type

2021-01-22 11:40:00 +01:00

net

bpf: Take return from set_memory_rox() into account with bpf_jit_binary_lock_ro()

2024-03-14 19:28:52 -07:00

pci

MIPS: TXx9: Use PCI_SET_ERROR_RESPONSE()

2024-02-20 13:36:35 +01:00

pic32

MIPS: Fixup explicit DT include clean-up

2023-07-28 11:41:09 +02:00

power

mips: suspend: include linux/suspend.h as needed

2023-12-10 17:21:41 -08:00

ralink

MIPS: ralink: Don't use "proxy" headers

2024-03-11 13:57:18 +01:00

rb532

MIPS: rb532: move GPIOD definition into C-files

2022-03-30 20:26:26 +02:00

sgi-ip22

mips: sgi-ip22: make gio_bus_type const

2024-02-20 13:36:34 +01:00

sgi-ip27

MIPS: sgi-ip27: Fix missing prototypes

2024-01-22 11:11:49 +01:00

sgi-ip30

MIPS: sgi-ip30: Fix missing prototypes

2024-01-22 11:12:08 +01:00

sgi-ip32

MIPS: sgi-ip32: Fix missing prototypes

2024-01-22 11:12:19 +01:00

sibyte

mips: sibyte: make tb_class constant

2024-03-07 17:19:08 +01:00

sni

vgacon: clean up global screen_info instances

2023-10-17 10:17:02 +02:00

tools

MIPS: fix typos in comments

2022-05-04 22:22:59 +02:00

txx9

mips: txx9: make txx9_sramc_subsys const

2024-02-20 13:36:34 +01:00

vdso

arch: vdso: consolidate gettime prototypes

2023-11-23 11:32:32 +01:00

Kbuild

MIPS: Share generic kernel code with other architecture

2024-02-20 13:36:25 +01:00

Kbuild.platforms

MIPS: Add support for Mobileye EyeQ5

2024-02-20 13:36:34 +01:00

Kconfig

MIPS: move unselectable FIT_IMAGE_FDT_EPM5 out of the "System type" choice

2024-03-27 01:58:34 +09:00

Kconfig.debug

tracing: Refactor TRACE_IRQFLAGS_SUPPORT in Kconfig

2021-08-16 11:37:21 -04:00

Makefile

MIPS: Loongson64: test for -march=loongson3a cflag

2024-02-23 10:13:47 +01:00

Makefile.postlink

kbuild: remove ARCH_POSTLINK from module builds

2023-10-28 21:10:08 +09:00