]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'for-next/core' into for-kernelci
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 14 Nov 2024 12:07:32 +0000 (12:07 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 14 Nov 2024 12:07:32 +0000 (12:07 +0000)
* for-next/core: (168 commits)
  arm64: tls: Fix context-switching of tpidrro_el0 when kpti is enabled
  kselftest/arm64: Try harder to generate different keys during PAC tests
  kselftest/arm64: Don't leak pipe fds in pac.exec_sign_all()
  arm64/ptrace: Clarify documentation of VL configuration via ptrace
  kselftest/arm64: Corrupt P0 in the irritator when testing SSVE
  acpi/arm64: remove unnecessary cast
  arm64/mm: Change protval as 'pteval_t' in map_range()
  kselftest/arm64: Fix missing printf() argument in gcs/gcs-stress.c
  kselftest/arm64: Add FPMR coverage to fp-ptrace
  kselftest/arm64: Expand the set of ZA writes fp-ptrace does
  kselftets/arm64: Use flag bits for features in fp-ptrace assembler code
  kselftest/arm64: Enable build of PAC tests with LLVM=1
  kselftest/arm64: Check that SVCR is 0 in signal handlers
  selftests/mm: Fix unused function warning for aarch64_write_signal_pkey()
  kselftest/arm64: Fix printf() compiler warnings in the arm64 syscall-abi.c tests
  kselftest/arm64: Fix printf() warning in the arm64 MTE prctl() test
  kselftest/arm64: Fix printf() compiler warnings in the arm64 fp tests
  kselftest/arm64: Fix build with stricter assemblers
  arm64/scs: Drop unused prototype __pi_scs_patch_vmlinux()
  arm64/scs: Deal with 64-bit relative offsets in FDE frames
  ...

# Conflicts:
# arch/arm64/include/asm/mman.h

1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/arm64/Kconfig
arch/arm64/include/asm/mman.h
arch/arm64/kernel/asm-offsets.c
arch/arm64/kernel/fpsimd.c
arch/arm64/kvm/mmu.c
arch/x86/Kconfig
fs/proc/task_mmu.c
include/linux/mm.h
mm/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
index 798d965760d43467163cdc35560e1b88e50c3deb,1dbfb56cb313f9996e73b39059de048f5837f5af..e1572482fae83016d0fee6cc8e1c5549cef85aa3
@@@ -42,7 -39,7 +42,7 @@@ static inline unsigned long arch_calc_v
         * filesystem supporting MTE (RAM-based).
         */
        if (system_supports_mte() &&
-           ((flags & MAP_ANONYMOUS) || shmem_file(file)))
 -          (flags & (MAP_ANONYMOUS | MAP_HUGETLB)))
++          ((flags & (MAP_ANONYMOUS | MAP_HUGETLB)) || shmem_file(file)))
                return VM_MTE_ALLOWED;
  
        return 0;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/Kconfig
Simple merge