Cross-merge networking fixes after downstream PR.
No conflicts, or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | .mailmap | 6 | |
| -rw-r--r-- | Documentation/arch/riscv/vm-layout.rst | 16 | |
| -rw-r--r-- | Documentation/arch/x86/resctrl.rst | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml | 49 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/partitions/linux,ubi.yaml | 75 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/partitions/ubi-volume.yaml | 40 | |
| -rw-r--r-- | Documentation/devicetree/bindings/riscv/cpus.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/riscv/extensions.yaml | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/abracon,abx80x.txt | 31 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/abracon,abx80x.yaml | 98 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/mediatek,mt2712-rtc.yaml | 39 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/mediatek,mt7622-rtc.yaml | 52 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/rtc-mt2712.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/rtc-mt7622.txt | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/cdns,ttc.yaml | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/ralink,cevt-systick.yaml | 38 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,ostm.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,tmu.yaml | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml | 2 | |
| -rw-r--r-- | Documentation/features/sched/membarrier-sync-core/arch-support.txt | 18 | |
| -rw-r--r-- | Documentation/mm/page_cache.rst | 10 | |
| -rw-r--r-- | Documentation/scheduler/index.rst | 1 | |
| -rw-r--r-- | Documentation/scheduler/membarrier.rst | 39 | |
| -rw-r--r-- | Documentation/scheduler/sched-design-CFS.rst | 3 | |
| -rw-r--r-- | Documentation/spi/spi-lm70llp.rst | 4 | |
| -rw-r--r-- | Documentation/spi/spidev.rst | 2 | |
| -rw-r--r-- | MAINTAINERS | 53 | |
| -rw-r--r-- | Makefile | 4 | |
| -rw-r--r-- | arch/Kconfig | 2 | |
| -rw-r--r-- | arch/arm/Kconfig | 4 | |
| -rw-r--r-- | arch/arm/Kconfig.debug | 3 | |
| -rw-r--r-- | arch/arm/include/asm/mman.h | 14 | |
| -rw-r--r-- | arch/arm/include/asm/ptrace.h | 5 | |
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 | |
| -rw-r--r-- | arch/arm/kernel/iwmmxt.S | 51 | |
| -rw-r--r-- | arch/arm/kernel/pj4-cp0.c | 135 | |
| -rw-r--r-- | arch/arm/kernel/traps.c | 2 | |
| -rw-r--r-- | arch/arm/kernel/unwind.c | 2 | |
| -rw-r--r-- | arch/arm/mm/fault.c | 8 | |
| -rw-r--r-- | arch/arm/mm/flush.c | 3 | |
| -rw-r--r-- | arch/arm/mm/init.c | 2 | |
| -rw-r--r-- | arch/arm64/Kconfig | 3 | |
| -rw-r--r-- | arch/arm64/net/bpf_jit_comp.c | 4 | |
| -rw-r--r-- | arch/hexagon/kernel/vmlinux.lds.S | 1 | |
| -rw-r--r-- | arch/loongarch/Kconfig | 8 | |
| -rw-r--r-- | arch/loongarch/Kconfig.debug | 11 | |
| -rw-r--r-- | arch/loongarch/Makefile | 23 | |
| -rw-r--r-- | arch/loongarch/crypto/crc32-loongarch.c | 2 | |
| -rw-r--r-- | arch/loongarch/include/asm/Kbuild | 3 | |
| -rw-r--r-- | arch/loongarch/include/asm/bug.h | 1 | |
| -rw-r--r-- | arch/loongarch/include/asm/cacheflush.h | 3 | |
| -rw-r--r-- | arch/loongarch/include/asm/exception.h | 2 | |
| -rw-r--r-- | arch/loongarch/include/asm/io.h | 2 | |
| -rw-r--r-- | arch/loongarch/include/asm/module.h | 7 | |
| -rw-r--r-- | arch/loongarch/include/asm/orc_header.h | 18 | |
| -rw-r--r-- | arch/loongarch/include/asm/orc_lookup.h | 31 | |
| -rw-r--r-- | arch/loongarch/include/asm/orc_types.h | 58 | |
| -rw-r--r-- | arch/loongarch/include/asm/page.h | 3 | |
| -rw-r--r-- | arch/loongarch/include/asm/percpu.h | 7 | |
| -rw-r--r-- | arch/loongarch/include/asm/pgtable.h | 3 | |
| -rw-r--r-- | arch/loongarch/include/asm/qspinlock.h | 18 | |
| -rw-r--r-- | arch/loongarch/include/asm/stackframe.h | 3 | |
| -rw-r--r-- | arch/loongarch/include/asm/thread_info.h | 2 | |
| -rw-r--r-- | arch/loongarch/include/asm/unwind.h | 20 | |
| -rw-r--r-- | arch/loongarch/include/asm/unwind_hints.h | 28 | |
| -rw-r--r-- | arch/loongarch/kernel/Makefile | 4 | |
| -rw-r--r-- | arch/loongarch/kernel/entry.S | 5 | |
| -rw-r--r-- | arch/loongarch/kernel/fpu.S | 7 | |
| -rw-r--r-- | arch/loongarch/kernel/genex.S | 6 | |
| -rw-r--r-- | arch/loongarch/kernel/lbt.S | 3 | |
| -rw-r--r-- | arch/loongarch/kernel/mcount_dyn.S | 6 | |
| -rw-r--r-- | arch/loongarch/kernel/module.c | 22 | |
| -rw-r--r-- | arch/loongarch/kernel/relocate_kernel.S | 7 | |
| -rw-r--r-- | arch/loongarch/kernel/rethook_trampoline.S | 1 | |
| -rw-r--r-- | arch/loongarch/kernel/setup.c | 2 | |
| -rw-r--r-- | arch/loongarch/kernel/stacktrace.c | 41 | |
| -rw-r--r-- | arch/loongarch/kernel/traps.c | 42 | |
| -rw-r--r-- | arch/loongarch/kernel/unwind_orc.c | 528 | |
| -rw-r--r-- | arch/loongarch/kernel/vmlinux.lds.S | 3 | |
| -rw-r--r-- | arch/loongarch/kvm/switch.S | 9 | |
| -rw-r--r-- | arch/loongarch/lib/clear_user.S | 3 | |
| -rw-r--r-- | arch/loongarch/lib/copy_user.S | 3 | |
| -rw-r--r-- | arch/loongarch/lib/memcpy.S | 3 | |
| -rw-r--r-- | arch/loongarch/lib/memset.S | 3 | |
| -rw-r--r-- | arch/loongarch/mm/tlb.c | 27 | |
| -rw-r--r-- | arch/loongarch/mm/tlbex.S | 9 | |
| -rw-r--r-- | arch/loongarch/vdso/Makefile | 1 | |
| -rw-r--r-- | arch/parisc/include/asm/mman.h | 14 | |
| -rw-r--r-- | arch/powerpc/Kconfig | 9 | |
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 98 | |
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 4 | |
| -rw-r--r-- | arch/powerpc/kexec/Makefile | 3 | |
| -rw-r--r-- | arch/powerpc/kexec/core.c | 4 | |
| -rw-r--r-- | arch/powerpc/kexec/elf_64.c | 4 | |
| -rw-r--r-- | arch/powerpc/kexec/file_load_64.c | 269 | |
| -rw-r--r-- | arch/powerpc/mm/book3s32/mmu.c | 7 | |
| -rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 8 | |
| -rw-r--r-- | arch/powerpc/mm/nohash/8xx.c | 33 | |
| -rw-r--r-- | arch/powerpc/mm/nohash/e500.c | 10 | |
| -rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 38 | |
| -rw-r--r-- | arch/powerpc/platforms/powernv/smp.c | 2 | |
| -rw-r--r-- | arch/riscv/Kbuild | 1 | |
| -rw-r--r-- | arch/riscv/Kconfig | 80 | |
| -rw-r--r-- | arch/riscv/Makefile | 5 | |
| -rw-r--r-- | arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 | |
| -rw-r--r-- | arch/riscv/configs/defconfig | 3 | |
| -rw-r--r-- | arch/riscv/crypto/Kconfig | 93 | |
| -rw-r--r-- | arch/riscv/crypto/Makefile | 23 | |
| -rw-r--r-- | arch/riscv/crypto/aes-macros.S | 156 | |
| -rw-r--r-- | arch/riscv/crypto/aes-riscv64-glue.c | 637 | |
| -rw-r--r-- | arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S | 312 | |
| -rw-r--r-- | arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S | 146 | |
| -rw-r--r-- | arch/riscv/crypto/aes-riscv64-zvkned.S | 339 | |
| -rw-r--r-- | arch/riscv/crypto/chacha-riscv64-glue.c | 101 | |
| -rw-r--r-- | arch/riscv/crypto/chacha-riscv64-zvkb.S | 294 | |
| -rw-r--r-- | arch/riscv/crypto/ghash-riscv64-glue.c | 168 | |
| -rw-r--r-- | arch/riscv/crypto/ghash-riscv64-zvkg.S | 72 | |
| -rw-r--r-- | arch/riscv/crypto/sha256-riscv64-glue.c | 137 | |
| -rw-r--r-- | arch/riscv/crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S | 225 | |
| -rw-r--r-- | arch/riscv/crypto/sha512-riscv64-glue.c | 133 | |
| -rw-r--r-- | arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S | 203 | |
| -rw-r--r-- | arch/riscv/crypto/sm3-riscv64-glue.c | 112 | |
| -rw-r--r-- | arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S | 123 | |
| -rw-r--r-- | arch/riscv/crypto/sm4-riscv64-glue.c | 107 | |
| -rw-r--r-- | arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S | 117 | |
| -rw-r--r-- | arch/riscv/errata/andes/errata.c | 10 | |
| -rw-r--r-- | arch/riscv/include/asm/asm.h | 10 | |
|