From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Apr 2024 15:25:22 +0000 (+0200)
Subject: 6.8-stable patches
X-Git-Tag: v6.7.12~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1198191ca057507b1c05657a940fbc8e1968bc3;p=thirdparty%2Fkernel%2Fstable-queue.git

6.8-stable patches

added patches:
	tools-resolve_btfids-fix-build-with-musl-libc.patch
---

diff --git a/queue-6.8/series b/queue-6.8/series
index 3913015aa19..737167c1e8f 100644
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -396,3 +396,4 @@ scsi-libsas-add-a-helper-sas_get_sas_addr_and_dev_type.patch
 scsi-libsas-fix-disk-not-being-scanned-in-after-being-removed.patch
 perf-x86-amd-core-update-and-fix-stalled-cycles-events-for-zen-2-and-later.patch
 x86-sev-skip-rom-range-scans-and-validation-for-sev-snp-guests.patch
+tools-resolve_btfids-fix-build-with-musl-libc.patch
diff --git a/queue-6.8/tools-resolve_btfids-fix-build-with-musl-libc.patch b/queue-6.8/tools-resolve_btfids-fix-build-with-musl-libc.patch
new file mode 100644
index 00000000000..37f7e429d0b
--- /dev/null
+++ b/queue-6.8/tools-resolve_btfids-fix-build-with-musl-libc.patch
@@ -0,0 +1,36 @@
+From 62248b22d01e96a4d669cde0d7005bd51ebf9e76 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 28 Mar 2024 11:59:13 +0100
+Subject: tools/resolve_btfids: fix build with musl libc
+
+From: Natanael Copa <ncopa@alpinelinux.org>
+
+commit 62248b22d01e96a4d669cde0d7005bd51ebf9e76 upstream.
+
+Include the header that defines u32.
+This fixes build of 6.6.23 and 6.1.83 kernels for Alpine Linux, which
+uses musl libc. I assume that GNU libc indirecly pulls in linux/types.h.
+
+Fixes: 9707ac4fe2f5 ("tools/resolve_btfids: Refactor set sorting with types from btf_ids.h")
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218647
+Cc: stable@vger.kernel.org
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+Tested-by: Greg Thelen <gthelen@google.com>
+Link: https://lore.kernel.org/r/20240328110103.28734-1-ncopa@alpinelinux.org
+Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/include/linux/btf_ids.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/tools/include/linux/btf_ids.h
++++ b/tools/include/linux/btf_ids.h
+@@ -3,6 +3,8 @@
+ #ifndef _LINUX_BTF_IDS_H
+ #define _LINUX_BTF_IDS_H
+ 
++#include <linux/types.h> /* for u32 */
++
+ struct btf_id_set {
+ 	u32 cnt;
+ 	u32 ids[];