Backport ARM TRBE patches to 6.5

Ubuntu.md

@@ -1,8 +1,8 @@
-Name:    linux
-Version: 6.1.0
-Series:  23.04 (lunar)
+Name:    linux-nvidia-6.5
+Version: 6.5.0
+Series:  22.04 (jammy)
 Description:
-    This is the source code for the Ubuntu linux kernel for the 23.04 series. This
-    source tree is used to produce the flavours: generic, generic-64k, generic-lpae.
+    This is the source code for the Ubuntu linux kernel for the 22.04 series. This
+    source tree is used to produce the flavours: nvidia, nvidia-64k.
     This kernel is configured to support the widest range of desktop, laptop and
     server configurations.

arch/arm64/include/asm/acpi.h

@@ -42,6 +42,9 @@
 #define ACPI_MADT_GICC_SPE  (offsetof(struct acpi_madt_generic_interrupt, \
 	spe_interrupt) + sizeof(u16))
 
+#define ACPI_MADT_GICC_TRBE  (offsetof(struct acpi_madt_generic_interrupt, \
+	trbe_interrupt) + sizeof(u16))
+
 /* Basic configuration for ACPI */
 #ifdef	CONFIG_ACPI
 pgprot_t __acpi_get_mem_attribute(phys_addr_t addr);

arch/powerpc/kernel/module_64.c

@@ -347,13 +347,12 @@ static unsigned long get_got_size(const Elf64_Ehdr *hdr,
 static void dedotify_versions(struct modversion_info *vers,
 			      unsigned long size)
 {
-	struct modversion_info *end = (void *)vers + size;
+	struct modversion_info *end;
 
-	for (; vers < end && vers->next; vers = (void *)vers + vers->next) {
+	for (end = (void *)vers + size; vers < end; vers++)
 		if (vers->name[0] == '.') {
 			memmove(vers->name, vers->name+1, strlen(vers->name));
 		}
-	}
 }
 
 /*

debian.master/control.stub.in

@@ -37,7 +37,7 @@ Build-Depends:
  libnuma-dev [amd64 arm64 ppc64el s390x] <!stage1>,
  dkms <!stage1>,
  curl <!stage1>,
- zstd <!stage1>,
+ zstd [amd64 s390x] <!stage1>,
  pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] <!stage1>,
  clang-15 [amd64],
  libclang1-15 [amd64],

debian.nvidia-6.5/abi/abiname

@@ -0,0 +1 @@
+1010

debian.nvidia-6.5/abi/amd64/nvidia.compiler

@@ -0,0 +1 @@
+GCC: (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0