From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Nov 2025 19:16:14 +0000 (-0800)
Subject: Merge tag 'loongarch-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.18-rc7~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eba5e05d9bcf4cdea995ed51b0f07ba0275794a;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'loongarch-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "Use UAPI types in ptrace UAPI header to fix nolibc ptrace.

  Fix CPU name display, NUMA node parsing, kexec/kdump, PCI init and BPF
  trampoline"

* tag 'loongarch-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: BPF: Disable trampoline for kernel module function trace
  LoongArch: Don't panic if no valid cache info for PCI
  LoongArch: Mask all interrupts during kexec/kdump
  LoongArch: Fix NUMA node parsing with numa_memblks
  LoongArch: Consolidate CPU names in /proc/cpuinfo
  LoongArch: Use UAPI types in ptrace UAPI header
---

2eba5e05d9bcf4cdea995ed51b0f07ba0275794a