WORKSPACE: bump kernel to 5.15.104
Bumps the kernel to the latest patch release.
Hash verified against GPG signature from
647F28654894E3BD457199BE38DBBDC86092693E alias Greg KH.
Change-Id: I20d78d0492d1e869d684a1c045341f142f2039c8
Reviewed-on: https://review.monogon.dev/c/monogon/+/1410
Tested-by: Jenkins CI
Reviewed-by: Leopold Schabel <leo@monogon.tech>
diff --git a/WORKSPACE b/WORKSPACE
index 17d438b..398622a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -129,7 +129,7 @@
linux_external(
name = "linux",
- version = "5.15.32",
+ version = "5.15.104",
)
load("//third_party/linux-firmware:external.bzl", "linux_firmware_external")
diff --git a/third_party/linux/external.bzl b/third_party/linux/external.bzl
index 2ef9ae6..236f891 100644
--- a/third_party/linux/external.bzl
+++ b/third_party/linux/external.bzl
@@ -23,6 +23,7 @@
"5.10.4": "904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec",
"5.15.2": "5634033a4981be42d3259f50d5371a2cdc9ace5d9860da67a2879630533ab175",
"5.15.32": "1463cdfa223088610dd65d3eadeffa44ec49746091b8ae8ddac6f3070d17df86",
+ "5.15.104": "71c532ce09992e470f3259ffeb38d2b5bba990c243a559e4726a57412bd36b54",
}
http_archive(
name = name,
diff --git a/third_party/linux/external/discard-gnu-note-section.patch b/third_party/linux/external/discard-gnu-note-section.patch
index c874772..44248be 100644
--- a/third_party/linux/external/discard-gnu-note-section.patch
+++ b/third_party/linux/external/discard-gnu-note-section.patch
@@ -1,4 +1,4 @@
-From d2ab95a534255d8d54640c84d05e266171e07328 Mon Sep 17 00:00:00 2001
+From c2b13908b9d655bf9a2baab256a8aaffa6e11565 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 27 Apr 2020 18:49:00 -0700
Subject: [PATCH] Discard .note.gnu.property sections in generic NOTES
@@ -55,28 +55,29 @@
Reviewed-by: Kees Cook <keescook@chromium.org>
Rebased-by: Lorenz Brun <lorenz@monogon.tech>
---
- include/asm-generic/vmlinux.lds.h | 7 +++++++
- 1 file changed, 7 insertions(+)
+ include/asm-generic/vmlinux.lds.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index f2984af2b85b..851c48a3c031 100644
+index 8471717c5085..15c74f9a2999 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
-@@ -903,7 +903,14 @@
- #define PRINTK_INDEX
- #endif
-
-+/*
+@@ -906,9 +906,14 @@
+ /*
+ * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler.
+ * Otherwise, the type of .notes section would become PROGBITS instead of NOTES.
+ * Discard .note.gnu.property sections which are unused and have
+ * different alignment requirement from kernel note sections.
-+ */
+ */
#define NOTES \
-+ /DISCARD/ : { \
+- /DISCARD/ : { *(.note.GNU-stack) } \
++ /DISCARD/ : { \
++ *(.note.GNU-stack) \
+ *(.note.gnu.property) \
-+ } \
++ } \
.notes : AT(ADDR(.notes) - LOAD_OFFSET) { \
__start_notes = .; \
KEEP(*(.note.*)) \
--
-2.25.1
+2.39.2