Skip to content

Commit 7d95aa8

Browse files
committed
Rebase on a 6.12.76 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>
1 parent 3d862c8 commit 7d95aa8

27 files changed

Lines changed: 37 additions & 37 deletions

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
KERNEL_VERSION = linux-6.12.68
1+
KERNEL_VERSION = linux-6.12.76
22
KERNEL_REMOTE = https://cdn.kernel.org/pub/linux/kernel/v6.x/$(KERNEL_VERSION).tar.xz
33
KERNEL_TARBALL = tarballs/$(KERNEL_VERSION).tar.xz
44
KERNEL_SOURCES = $(KERNEL_VERSION)
55
KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort)
66
KERNEL_C_BUNDLE = kernel.c
77

88
ABI_VERSION = 5
9-
FULL_VERSION = 5.2.1
10-
TIMESTAMP = "Tue Feb 17 16:15:12 CET 2026"
9+
FULL_VERSION = 5.3.0
10+
TIMESTAMP = "Tue Mar 10 13:28:56 CET 2026"
1111

1212
KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
1313
KERNEL_FLAGS += KBUILD_BUILD_USER=root

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d182aced6eb0b6a2ef37c527a5bdc4edc9309814 Mon Sep 17 00:00:00 2001
1+
From 70b8ab2d1d4ba865efe08ba1307f694b9f154859 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@sinrega.org>
33
Date: Fri, 10 Sep 2021 13:05:01 +0200
44
Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e1efec284a4fd0c93bbf0dbdff93de155ca57d75 Mon Sep 17 00:00:00 2001
1+
From b7bfb048dc9df54f4dc742e4787766a7fd2e39f8 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Thu, 20 Oct 2022 10:23:16 +0200
44
Subject: [PATCH 2/4] x86/sev: write AP reset vector

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 626b9774b46c065a2e35c85175bc297fa18c6db0 Mon Sep 17 00:00:00 2001
1+
From 8dfe0e6ed7600a8cd1e2caa7b1e61116493d5001 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Wed, 3 Aug 2022 12:35:12 +0200
44
Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4f32badc01e04101f6f1011a1ef987f790479d23 Mon Sep 17 00:00:00 2001
1+
From c388e16aabfa5e989d0ca71c95ac24acfd72d2d4 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Wed, 5 Jun 2024 16:20:08 +0200
44
Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a394a9bf8eb5716dce71a31879ceb698e33af2a6 Mon Sep 17 00:00:00 2001
1+
From 817f5791591a123e06fa85993aa24f2e4367c506 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Thu, 2 Mar 2023 07:34:49 +0100
44
Subject: [PATCH 01/22] krunfw: Don't panic when init dies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e163341cc6e989390ff80648a6b1dd0b4008e1a1 Mon Sep 17 00:00:00 2001
1+
From db750d64e3f36576b667b67e979ec800a1eec872 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Mon, 16 May 2022 16:04:27 +0200
44
Subject: [PATCH 02/22] krunfw: Ignore run_cmd on orderly reboot

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bf68cd730c769f73a2a6da9ed0b928c03c53bfac Mon Sep 17 00:00:00 2001
1+
From 56ef3652b6666b91c1c66fa94aedac70a934bfb2 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:28 +0000
44
Subject: [PATCH 03/22] vsock/dgram: generalize recvmsg and drop
@@ -232,7 +232,7 @@ index 9b1f9a83c711..3ef8ff2a8b3c 100644
232232
{
233233
return false;
234234
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
235-
index 7eccd6708d66..dea4f9474228 100644
235+
index aca3132689cf..956109393596 100644
236236
--- a/net/vmw_vsock/vmci_transport.c
237237
+++ b/net/vmw_vsock/vmci_transport.c
238238
@@ -1731,57 +1731,40 @@ static int vmci_transport_dgram_enqueue(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8dce0bd708b16d791c3d5d9099e3b3c50b18ef00 Mon Sep 17 00:00:00 2001
1+
From 385e0bdc508313f07f59bbe26cf91ed6d97eaf39 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:29 +0000
44
Subject: [PATCH 04/22] vsock: refactor transport lookup code

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2e093eb6bbfb99d68cd71a92fa929a128433e0ae Mon Sep 17 00:00:00 2001
1+
From 774a9ccd77a3adb0f736f3f2323bde3d0b06b210 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:30 +0000
44
Subject: [PATCH 05/22] vsock: support multi-transport datagrams

0 commit comments

Comments
 (0)