Rebase on a v6.6.63 kernel

This is an almost clean rebase with only a minor change required in
(non-sev) patch number 5.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

Makefile

@@ -1,13 +1,13 @@
-KERNEL_VERSION = linux-6.6.59
+KERNEL_VERSION = linux-6.6.63
 KERNEL_REMOTE = https://cdn.kernel.org/pub/linux/kernel/v6.x/$(KERNEL_VERSION).tar.xz
 KERNEL_TARBALL = tarballs/$(KERNEL_VERSION).tar.xz
 KERNEL_SOURCES = $(KERNEL_VERSION)
 KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort)
 KERNEL_C_BUNDLE = kernel.c
 
 ABI_VERSION = 4
-FULL_VERSION = 4.5.1
-TIMESTAMP = "Thu Nov  7 05:07:35 PM CET 2024"
+FULL_VERSION = 4.6.0
+TIMESTAMP = "Mon Dec  2 11:39:28 CET 2024"
 
 KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
 KERNEL_FLAGS += KBUILD_BUILD_USER=root

patches-sev/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch

@@ -1,4 +1,4 @@
-From 83aec6003044244d4c2e3851dcec0af97ec0486f Mon Sep 17 00:00:00 2001
+From 937e56d777cf3809a5ac0a5d8d42dfcbcc93c330 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted

patches-sev/0002-x86-sev-write-AP-reset-vector.patch

@@ -1,4 +1,4 @@
-From b6379abecd7a40dbbd98ef09eca23789c693bc24 Mon Sep 17 00:00:00 2001
+From 15cc4533c0e0bfa1b8a762ecffb5486ed258d87a Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 20 Oct 2022 10:23:16 +0200
 Subject: [PATCH 2/4] x86/sev: write AP reset vector

patches-sev/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch

@@ -1,4 +1,4 @@
-From d10df5bc5c8986a6dd0961ebf354c7e6ecfbda32 Mon Sep 17 00:00:00 2001
+From 4db2da9b067d0c7b10d7f7543c45dcb0d608e307 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 3 Aug 2022 12:35:12 +0200
 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline

patches-sev/0004-x86-sev-Avoid-using-native_cpuid.patch

@@ -1,4 +1,4 @@
-From baaba00fa3a3c5407b8a08f262388b173306219f Mon Sep 17 00:00:00 2001
+From d53bef286ab6731ad5c721537ef8ad3ec39c0200 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 5 Jun 2024 16:20:08 +0200
 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid

patches/0001-krunfw-Don-t-panic-when-init-dies.patch

@@ -1,4 +1,4 @@
-From 7f18f75689b7b0f34ca711daa4e29e2d4ae5f910 Mon Sep 17 00:00:00 2001
+From a6442523102c4d482bf24f0f21a38ae29b3f0c8c Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 2 Mar 2023 07:34:49 +0100
 Subject: [PATCH 01/20] krunfw: Don't panic when init dies

patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch

@@ -1,4 +1,4 @@
-From 5ed6edb3e75df34958f788bca363748cea75eea1 Mon Sep 17 00:00:00 2001
+From 46b2f712bf3d3de11cbc0358ec6f833be99f2f49 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Mon, 16 May 2022 16:04:27 +0200
 Subject: [PATCH 02/20] krunfw: Ignore run_cmd on orderly reboot

patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch

@@ -1,4 +1,4 @@
-From 06a9c813b4f59d92edf78a6011a719629323081c Mon Sep 17 00:00:00 2001
+From 0bef0669ef2606831f442e86254e9e1ab86809b6 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:28 +0000
 Subject: [PATCH 03/20] vsock/dgram: generalize recvmsg and drop
@@ -151,10 +151,10 @@ index f5eb737a677d..c3fdb22cfd39 100644
 
  int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
 diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
-index e2157e387217..a83b30d366af 100644
+index 56c232cf5b0f..cc0a6c3401d3 100644
 --- a/net/vmw_vsock/hyperv_transport.c
 +++ b/net/vmw_vsock/hyperv_transport.c
-@@ -556,8 +556,17 @@ static int hvs_dgram_bind(struct vsock_sock *vsk, struct sockaddr_vm *addr)
+@@ -557,8 +557,17 @@ static int hvs_dgram_bind(struct vsock_sock *vsk, struct sockaddr_vm *addr)
  	return -EOPNOTSUPP;
  }
 
@@ -174,7 +174,7 @@ index e2157e387217..a83b30d366af 100644
  {
  	return -EOPNOTSUPP;
  }
-@@ -833,7 +842,9 @@ static struct vsock_transport hvs_transport = {
+@@ -834,7 +843,9 @@ static struct vsock_transport hvs_transport = {
  	.shutdown                 = hvs_shutdown,
 
  	.dgram_bind               = hvs_dgram_bind,
@@ -203,7 +203,7 @@ index 2925f5d27ad3..332d6d580cba 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index e87fd9480acd..ed1235d57ffb 100644
+index 43495820b64f..b566fc80f8db 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -860,6 +860,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,

patches/0004-vsock-refactor-transport-lookup-code.patch

@@ -1,4 +1,4 @@
-From 5a2b5b9c1a9f473836c361153b15c10eab012e9a Mon Sep 17 00:00:00 2001
+From 789729bfd16c0f28d6b591ffd4d2537c9f1e9873 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:29 +0000
 Subject: [PATCH 04/20] vsock: refactor transport lookup code

patches/0005-vsock-support-multi-transport-datagrams.patch

@@ -1,4 +1,4 @@
-From 10b18bb2d94abcf35e199c76fcf9921de1dbb9ae Mon Sep 17 00:00:00 2001
+From aa746f8898e3b89d6d93a1373a85eea7815bb416 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:30 +0000
 Subject: [PATCH 05/20] vsock: support multi-transport datagrams
@@ -238,11 +238,11 @@ index 5a517638deed..afe28d3b0b74 100644
 
  	/* sock map disallows redirection of non-TCP sockets with sk_state !=
 diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
-index a83b30d366af..1a9e9a22c929 100644
+index cc0a6c3401d3..4c6d705cc9e6 100644
 --- a/net/vmw_vsock/hyperv_transport.c
 +++ b/net/vmw_vsock/hyperv_transport.c
-@@ -551,11 +551,6 @@ static void hvs_destruct(struct vsock_sock *vsk)
- 	kfree(hvs);
+@@ -552,11 +552,6 @@ static void hvs_destruct(struct vsock_sock *vsk)
+ 	vsk->trans = NULL;
  }
 
 -static int hvs_dgram_bind(struct vsock_sock *vsk, struct sockaddr_vm *addr)
@@ -253,7 +253,7 @@ index a83b30d366af..1a9e9a22c929 100644
  static int hvs_dgram_get_cid(struct sk_buff *skb, unsigned int *cid)
  {
  	return -EOPNOTSUPP;
-@@ -841,7 +836,6 @@ static struct vsock_transport hvs_transport = {
+@@ -842,7 +837,6 @@ static struct vsock_transport hvs_transport = {
  	.connect                  = hvs_connect,
  	.shutdown                 = hvs_shutdown,
 
@@ -274,7 +274,7 @@ index 332d6d580cba..4e138ad3c113 100644
  		.dgram_allow              = virtio_transport_dgram_allow,
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index ed1235d57ffb..0b2f6c211544 100644
+index b566fc80f8db..456dfa74c642 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -853,13 +853,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)

patches/0006-vsock-make-vsock-bind-reusable.patch

@@ -1,4 +1,4 @@
-From 9b076ce6da60de7904d340289a2187325efee512 Mon Sep 17 00:00:00 2001
+From 47c855617435187d710744e4144b11390814da8a Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:31 +0000
 Subject: [PATCH 06/20] vsock: make vsock bind reusable

patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch

@@ -1,4 +1,4 @@
-From f9c572bf348f3eda2d0763ecf0e212cf6861d769 Mon Sep 17 00:00:00 2001
+From 3ff89941eeaa749a5d26bdd2cfc31ca9201770fd Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:32 +0000
 Subject: [PATCH 07/20] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit

patches/0008-virtio-vsock-support-dgrams.patch

@@ -1,4 +1,4 @@
-From cea879931c45169784b8b2301ae02ee45c4aa20d Mon Sep 17 00:00:00 2001
+From b103d01ce2eccd9b73f3db15674137b259f02ec4 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:33 +0000
 Subject: [PATCH 08/20] virtio/vsock: support dgrams
@@ -345,7 +345,7 @@ index 4e138ad3c113..3dd63dc8f6b7 100644
 
  static struct virtio_driver virtio_vsock_driver = {
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 0b2f6c211544..7ff2d3a44dc2 100644
+index 456dfa74c642..2908af557aa0 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
 @@ -37,6 +37,35 @@ virtio_transport_get_ops(struct vsock_sock *vsk)
@@ -475,23 +475,23 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
 +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_cid);
 +
 +int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *port)
-+{
+ {
+-	return -EOPNOTSUPP;
 +	*port = le32_to_cpu(virtio_vsock_hdr(skb)->src_port);
 +	return 0;
-+}
+ }
+-EXPORT_SYMBOL_GPL(virtio_transport_dgram_dequeue);
 +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_port);
 +
 +int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len)
- {
--	return -EOPNOTSUPP;
++{
 +	/* The device layer must have already moved the data ptr beyond the
 +	 * header for skb->len to be correct.
 +	 */
 +	WARN_ON(skb->data == skb->head);
 +	*len = skb->len;
 +	return 0;
- }
--EXPORT_SYMBOL_GPL(virtio_transport_dgram_dequeue);
++}
 +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_length);
 
  s64 virtio_transport_stream_has_data(struct vsock_sock *vsk)
@@ -563,15 +563,15 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
  }
  EXPORT_SYMBOL_GPL(virtio_transport_dgram_enqueue);
 
-@@ -966,6 +1030,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
+@@ -967,6 +1031,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
  		.reply = true,
  	};
  	struct sk_buff *reply;
 +	int err;
 
  	/* Send RST only if the original pkt is not a RST pkt */
  	if (le16_to_cpu(hdr->op) == VIRTIO_VSOCK_OP_RST)
-@@ -978,9 +1043,10 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
+@@ -979,9 +1044,10 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
  					   le64_to_cpu(hdr->dst_cid),
  					   le32_to_cpu(hdr->dst_port),
  					   le64_to_cpu(hdr->src_cid),
@@ -584,7 +584,7 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
 
  	return t->send_pkt(reply);
  }
-@@ -1200,6 +1266,21 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
+@@ -1201,6 +1267,21 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
  		kfree_skb(skb);
  }
 
@@ -606,7 +606,7 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
  static int
  virtio_transport_recv_connected(struct sock *sk,
  				struct sk_buff *skb)
-@@ -1369,7 +1450,8 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
+@@ -1378,7 +1459,8 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
  static bool virtio_transport_valid_type(u16 type)
  {
  	return (type == VIRTIO_VSOCK_TYPE_STREAM) ||
@@ -616,7 +616,7 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
  }
 
  /* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex
-@@ -1383,40 +1465,52 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1392,40 +1474,52 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
  	struct vsock_sock *vsk;
  	struct sock *sk;
  	bool space_available;
@@ -679,7 +679,7 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
  		sock_put(sk);
  		goto free_pkt;
  	}
-@@ -1432,12 +1526,18 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1441,12 +1535,18 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
 
  	/* Check if sk has been closed before lock_sock */
  	if (sock_flag(sk, SOCK_DONE)) {
@@ -699,7 +699,7 @@ index 0b2f6c211544..7ff2d3a44dc2 100644
  	space_available = virtio_transport_space_update(sk, skb);
 
  	/* Update CID in case it has changed after a transport reset event */
-@@ -1469,6 +1569,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1478,6 +1578,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
  		break;
  	}
 

patches/0009-tests-add-vsock-dgram-tests.patch

@@ -1,4 +1,4 @@
-From aacd77363c0f5c8515f9ef55889cd367d42d06f9 Mon Sep 17 00:00:00 2001
+From a05b3dd945767cdeda0d9dc9f1979a8c4e67d1b5 Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Sat, 10 Jun 2023 00:58:35 +0000
 Subject: [PATCH 09/20] tests: add vsock dgram tests

patches/0010-Transparent-Socket-Impersonation-implementation.patch

@@ -1,4 +1,4 @@
-From bf4eb6179408f2fb6bbdd0d750a494ca1d0bf9c2 Mon Sep 17 00:00:00 2001
+From ea172def827af9efb7b81ae19b0f2bde42c33b38 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:38:26 +0200
 Subject: [PATCH 10/20] Transparent Socket Impersonation implementation
@@ -83,7 +83,7 @@ index 4c4dc535453d..b07f65c0ef56 100644
  obj-$(CONFIG_NET_HANDSHAKE)	+= handshake/
 +obj-$(CONFIG_TSI)		+= tsi/
 diff --git a/net/socket.c b/net/socket.c
-index 9db33cd4a71b..8b92dd098235 100644
+index bad58f23f307..9992976a67ff 100644
 --- a/net/socket.c
 +++ b/net/socket.c
 @@ -218,6 +218,7 @@ static const char * const pf_family_names[] = {

patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch

@@ -1,4 +1,4 @@
-From 4cb286e56e14f2ea4b0c99567fb14558c508d2c0 Mon Sep 17 00:00:00 2001
+From 6fcf7ffdb2ef4f9808ba93d71e29488738c87189 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:42:01 +0200
 Subject: [PATCH 11/20] tsi: allow hijacking sockets (tsi_hijack)
@@ -14,7 +14,7 @@ Signed-off-by: Sergio Lopez <[email protected]>
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/net/socket.c b/net/socket.c
-index 8b92dd098235..ab2bd178bcc7 100644
+index 9992976a67ff..2a928d25f282 100644
 --- a/net/socket.c
 +++ b/net/socket.c
 @@ -115,6 +115,10 @@ unsigned int sysctl_net_busy_read __read_mostly;

patches/0012-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch

@@ -1,4 +1,4 @@
-From 322fce4105e6a4570c6d1c9ac154d89c6c0b2029 Mon Sep 17 00:00:00 2001
+From 4799b17d694746a858a8d4b05807f1e2efe252a6 Mon Sep 17 00:00:00 2001
 From: Asahi Lina <[email protected]>
 Date: Wed, 25 Sep 2024 16:35:34 +0200
 Subject: [PATCH 12/20] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late

patches/0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch

@@ -1,4 +1,4 @@
-From 61f6748465de43ae02b1e6ce78aa100ab9757d66 Mon Sep 17 00:00:00 2001
+From 910c13dfdcf052ba9c4a525f73e86dfd6961314e Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Thu, 11 Apr 2024 09:51:20 +0900
 Subject: [PATCH 13/20] prctl: Introduce PR_{SET,GET}_MEM_MODEL

patches/0014-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch

@@ -1,4 +1,4 @@
-From a0a7db4f8927e5f8dda3c99b1f8e8bed15eaba03 Mon Sep 17 00:00:00 2001
+From c6af9a365bcef9ffb50b58f0fc5e3bb80bee0ae2 Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Mon, 6 May 2024 16:47:51 +0200
 Subject: [PATCH 14/20] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO
@@ -27,10 +27,10 @@ Reviewed-by: Neal Gompa <[email protected]>
  create mode 100644 arch/arm64/kernel/cpufeature_impdef.c
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 9e0c1ac3d13e..741833d2f1a0 100644
+index 658c6a61ab6f..ffc0a44a8dee 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -2198,6 +2198,15 @@ config ARM64_DEBUG_PRIORITY_MASKING
+@@ -2200,6 +2200,15 @@ config ARM64_DEBUG_PRIORITY_MASKING
  	  If unsure, say N
  endif # ARM64_PSEUDO_NMI
 

patches/0015-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch

@@ -1,4 +1,4 @@
-From 411580c12e8dd196e525b71caebd4e847413747a Mon Sep 17 00:00:00 2001
+From f391c3e1b4072567adbebe792a0268433e68d2bc Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Thu, 11 Apr 2024 09:51:22 +0900
 Subject: [PATCH 15/20] arm64: Introduce scaffolding to add ACTLR_EL1 to thread
@@ -24,10 +24,10 @@ Reviewed-by: Neal Gompa <[email protected]>
  5 files changed, 44 insertions(+)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 741833d2f1a0..cefb705dc3c7 100644
+index ffc0a44a8dee..5f774ff0945a 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -409,6 +409,9 @@ config KASAN_SHADOW_OFFSET
+@@ -408,6 +408,9 @@ config KASAN_SHADOW_OFFSET
  config UNWIND_TABLES
  	bool
 

patches/0016-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch

@@ -1,4 +1,4 @@
-From b04f31204cda6ed6735f20138797ebd033558969 Mon Sep 17 00:00:00 2001
+From 641b03f2e7b6bd1285de906f3aee976aef38b8ba Mon Sep 17 00:00:00 2001
 From: Hector Martin <[email protected]>
 Date: Thu, 11 Apr 2024 09:51:23 +0900
 Subject: [PATCH 16/20] arm64: Implement Apple IMPDEF TSO memory model control
@@ -27,10 +27,10 @@ Reviewed-by: Neal Gompa <[email protected]>
  create mode 100644 arch/arm64/include/asm/apple_cpufeature.h
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index cefb705dc3c7..8302d602a6f9 100644
+index 5f774ff0945a..4cd140d0d693 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -2203,6 +2203,8 @@ endif # ARM64_PSEUDO_NMI
+@@ -2205,6 +2205,8 @@ endif # ARM64_PSEUDO_NMI
 
  config ARM64_MEMORY_MODEL_CONTROL
  	bool "Runtime memory model control"

patches/0017-drm-virtio-Support-fence-passing-feature.patch

@@ -1,4 +1,4 @@
-From 9ec85361575b3936127e5f879dc3250e716eb452 Mon Sep 17 00:00:00 2001
+From 1061d684a171eeca4bc66dfe26b5d3de7873d74a Mon Sep 17 00:00:00 2001
 From: Dmitry Osipenko <[email protected]>
 Date: Sat, 7 Oct 2023 22:47:47 +0300
 Subject: [PATCH 17/20] drm/virtio: Support fence-passing feature

patches/0018-Enable-64-bit-processes-to-use-compat-input-syscalls.patch

@@ -1,4 +1,4 @@
-From a2a7742b033bd36460343555bcc9ddedac9ffb88 Mon Sep 17 00:00:00 2001
+From 59d0207bce9759ed9f28fa62fb70e1bc36cae7a0 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Tue, 8 Oct 2024 11:24:25 +0200
 Subject: [PATCH 18/20] Enable 64 bit processes to use compat input syscalls
@@ -64,10 +64,10 @@ index 3b7bb12b023b..e78c0492ce0d 100644
  }
 
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 77f01ac385f7..01125573065e 100644
+index 3d83cc397eac..a48fce12adfb 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1535,6 +1535,11 @@ struct task_struct {
+@@ -1537,6 +1537,11 @@ struct task_struct {
  #ifdef CONFIG_USER_EVENTS
  	struct user_event_mm		*user_event_mm;
  #endif

patches/0019-dax-Allow-block-size-PAGE_SIZE.patch

@@ -1,4 +1,4 @@
-From 0d5513eeec3176ffdc62348f1fc52579f9daeebf Mon Sep 17 00:00:00 2001
+From dcf61fa3f1435132d79cf7e0a97db5fe883a2696 Mon Sep 17 00:00:00 2001
 From: Asahi Lina <[email protected]>
 Date: Sun, 20 Oct 2024 01:23:41 +0900
 Subject: [PATCH 19/20] dax: Allow block size > PAGE_SIZE
@@ -22,7 +22,7 @@ Signed-off-by: Asahi Lina <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/fs/dax.c b/fs/dax.c
-index 3380b43cb6bb..9a33625740c1 100644
+index 8c09578fa035..1f99f5556e85 100644
 --- a/fs/dax.c
 +++ b/fs/dax.c
 @@ -1032,7 +1032,7 @@ int dax_writeback_mapping_range(struct address_space *mapping,