Rebase on a 6.12.68 kernel

Rebase on the latest LTS 6.12.x kernel. No changes needed in the
downstream patches.

Signed-off-by: Sergio Lopez <slp@redhat.com>

Author: slp

Makefile

@@ -1,13 +1,13 @@
-KERNEL_VERSION = linux-6.12.62
+KERNEL_VERSION = linux-6.12.68
 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 = 5
-FULL_VERSION = 5.1.0
-TIMESTAMP = "Mon Dec 15 19:43:20 CET 2025"
+FULL_VERSION = 5.2.0
+TIMESTAMP = "Mon Feb  2 09:49:04 CET 2026"
 
 KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
 KERNEL_FLAGS += KBUILD_BUILD_USER=root

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

@@ -1,4 +1,4 @@
-From 22bd635cdd68a69b8c8d4634b8d4f4f137728c83 Mon Sep 17 00:00:00 2001
+From e04ce49396a2d87b76f3176ab2823d7570db8978 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@sinrega.org>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted
@@ -54,5 +54,5 @@ index c0276979675d..1d5b988e4452 100644
  	/*
  	 * In theory, it's possible to have a buggy QEMU-supposed
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 08abe3fa7e5077d68db83fd185824bd282f10bff Mon Sep 17 00:00:00 2001
+From 4f8ed469831f545810925db2a559ccdcaf14964b Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 20 Oct 2022 10:23:16 +0200
 Subject: [PATCH 2/4] x86/sev: write AP reset vector
@@ -55,5 +55,5 @@ index de1df0cb45da..7ed486a790fb 100644
  	/* Check if AP Jump Table is page-aligned */
  	if (jump_table_addr & ~PAGE_MASK)
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From fa867286cb5c528dbe6f2f89adbef217f818ba86 Mon Sep 17 00:00:00 2001
+From 8b2ab39aa90f8f163b65e48d406f969059f6fcef Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Wed, 3 Aug 2022 12:35:12 +0200
 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline
@@ -290,5 +290,5 @@ index 821df1f05e9c..04f8f5a6389d 100644
 
  /*
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 39e43808af2c24b6241a09d1caba5accc2df0393 Mon Sep 17 00:00:00 2001
+From 7cd68aac6e847d830c47d8e941123e734b635bba Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Wed, 5 Jun 2024 16:20:08 +0200
 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid
@@ -61,5 +61,5 @@ index b922b9fea6b6..c0de732b0121 100644
  	/* Check the SEV MSR whether SEV or SME is enabled */
  	RIP_REL_REF(sev_status) = msr = __rdmsr(MSR_AMD64_SEV);
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From f166568c772dd9b68e90e0aca45b945d495a77ba Mon Sep 17 00:00:00 2001
+From a394a9bf8eb5716dce71a31879ceb698e33af2a6 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 2 Mar 2023 07:34:49 +0100
 Subject: [PATCH 01/21] krunfw: Don't panic when init dies
@@ -59,5 +59,5 @@ index d6ee090eda94..f6947c5bd671 100644
  	machine_restart(cmd);
  }
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 1330ae22d337b4c4887edde853e602b79db06d17 Mon Sep 17 00:00:00 2001
+From e163341cc6e989390ff80648a6b1dd0b4008e1a1 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Mon, 16 May 2022 16:04:27 +0200
 Subject: [PATCH 02/21] krunfw: Ignore run_cmd on orderly reboot
@@ -28,5 +28,5 @@ index f6947c5bd671..5925d8fcfbfa 100644
  	if (ret) {
  		pr_warn("Failed to start orderly reboot: forcing the issue\n");
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From bf952042ef414f63b6b7f8a8ee60769af5121273 Mon Sep 17 00:00:00 2001
+From bf68cd730c769f73a2a6da9ed0b928c03c53bfac 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/21] vsock/dgram: generalize recvmsg and drop
@@ -23,7 +23,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  9 files changed, 137 insertions(+), 52 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index 66a0f060770e..d49a46b421ae 100644
+index 78cc66fbb3dd..fee8d1380e95 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -421,9 +421,11 @@ static struct virtio_transport vhost_transport = {
@@ -40,10 +40,10 @@ index 66a0f060770e..d49a46b421ae 100644
  		.stream_enqueue           = virtio_transport_stream_enqueue,
  		.stream_dequeue           = virtio_transport_stream_dequeue,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 6c00687539cf..7df9b94e65fa 100644
+index 0c67543a45c8..06d5b15642ae 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
-@@ -241,6 +241,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port);
+@@ -260,6 +260,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port);
  int virtio_transport_dgram_bind(struct vsock_sock *vsk,
  				struct sockaddr_vm *addr);
  bool virtio_transport_dgram_allow(u32 cid, u32 port);
@@ -81,7 +81,7 @@ index 70302c92d329..9ba6e2bcef94 100644
  	/* STREAM. */
  	/* TODO: stream_bind() */
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 621be9be64f6..4c53748ab9a6 100644
+index 282d97323324..fccb4761b8af 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -1359,10 +1359,62 @@ static int vsock_dgram_connect(struct socket *sock,
@@ -186,7 +186,7 @@ index 56c232cf5b0f..cc0a6c3401d3 100644
  	.dgram_allow              = hvs_dgram_allow,
 
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index 1ef6f7829d29..4751acddd117 100644
+index b6569b0ca2bb..d1107b65445e 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -552,9 +552,11 @@ static struct virtio_transport virtio_transport = {
@@ -203,10 +203,10 @@ index 1ef6f7829d29..4751acddd117 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 2c9b1011cdcc..ad4dedcfa320 100644
+index 9b1f9a83c711..3ef8ff2a8b3c 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
-@@ -1054,6 +1054,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
+@@ -1069,6 +1069,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
  }
  EXPORT_SYMBOL_GPL(virtio_transport_dgram_bind);
 
@@ -348,5 +348,5 @@ index 6e78927a598e..3d5e05d8950f 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From c9da069a2939f6fe9222277b4c536c462cac43da Mon Sep 17 00:00:00 2001
+From 8dce0bd708b16d791c3d5d9099e3b3c50b18ef00 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/21] vsock: refactor transport lookup code
@@ -14,7 +14,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 4c53748ab9a6..e428073518c7 100644
+index fccb4761b8af..4a8f62e7520d 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -432,6 +432,22 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)
@@ -57,5 +57,5 @@ index 4c53748ab9a6..e428073518c7 100644
  	default:
  		ret = -ESOCKTNOSUPPORT;
 -- 
-2.51.0
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From d8679f7eeb8cc05258484773858942a708011771 Mon Sep 17 00:00:00 2001
+From 2e093eb6bbfb99d68cd71a92fa929a128433e0ae 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/21] vsock: support multi-transport datagrams
@@ -57,7 +57,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  7 files changed, 60 insertions(+), 36 deletions(-)
 
 diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index d49a46b421ae..4659a74078bd 100644
+index fee8d1380e95..03b0e789d161 100644
 --- a/drivers/vhost/vsock.c
 +++ b/drivers/vhost/vsock.c
 @@ -421,7 +421,6 @@ static struct virtio_transport vhost_transport = {
@@ -69,10 +69,10 @@ index d49a46b421ae..4659a74078bd 100644
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
  		.dgram_get_port		  = virtio_transport_dgram_get_port,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 7df9b94e65fa..0a4369e01c4a 100644
+index 06d5b15642ae..6c8791d3bc70 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
-@@ -238,8 +238,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
+@@ -257,8 +257,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
  u64 virtio_transport_stream_rcvhiwat(struct vsock_sock *vsk);
  bool virtio_transport_stream_is_active(struct vsock_sock *vsk);
  bool virtio_transport_stream_allow(u32 cid, u32 port);
@@ -82,7 +82,7 @@ index 7df9b94e65fa..0a4369e01c4a 100644
  int virtio_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid);
  int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *port);
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index e428073518c7..a97ee1966e14 100644
+index 4a8f62e7520d..c15d9a6f8b89 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -448,6 +448,18 @@ vsock_connectible_lookup_transport(unsigned int cid, __u8 flags)
@@ -262,7 +262,7 @@ index cc0a6c3401d3..4c6d705cc9e6 100644
  	.dgram_get_port		  = hvs_dgram_get_port,
  	.dgram_get_length	  = hvs_dgram_get_length,
 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
-index 4751acddd117..359775d55685 100644
+index d1107b65445e..e9828815e741 100644
 --- a/net/vmw_vsock/virtio_transport.c
 +++ b/net/vmw_vsock/virtio_transport.c
 @@ -551,7 +551,6 @@ static struct virtio_transport virtio_transport = {
@@ -274,10 +274,10 @@ index 4751acddd117..359775d55685 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 ad4dedcfa320..96b6303b24c2 100644
+index 3ef8ff2a8b3c..70eee056871c 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
-@@ -1047,13 +1047,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
+@@ -1062,13 +1062,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
  }
  EXPORT_SYMBOL_GPL(virtio_transport_stream_allow);
 
@@ -304,5 +304,5 @@ index 3d5e05d8950f..9e9e124f8d2b 100644
  		.dgram_allow              = virtio_transport_dgram_allow,
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
 -- 
-2.51.0
+2.52.0