7.1-stable patches

added patches:
	perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
	slab-recognize-gfp-parameter-as-optional-in-kernel-doc.patch

diff --git a/queue-7.1/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch b/queue-7.1/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
new file mode 100644 (file)
index 0000000..20e943b
--- /dev/null
+++ b/queue-7.1/perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
@@ -0,0 +1,60 @@
+From 7ee7f48413c42b90230de4a8e40898b757bc8e82 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+Date: Wed, 13 May 2026 12:23:46 -0700
+Subject: perf trace beauty fcntl: Fix build with older kernel headers
+
+From: Florian Fainelli <florian.fainelli@broadcom.com>
+
+commit 7ee7f48413c42b90230de4a8e40898b757bc8e82 upstream.
+
+Toolchains with older kernel headers that do not include upstream commit
+c75b1d9421f80f41 ("fs: add fcntl() interface for setting/getting write
+life time hints") will now fail to build perf due to missing definitions
+for F_GET_RW_HINT/F_SET_RW_HINT/F_GET_FILE_RW_HINT/F_SET_FILE_RW_HINT.
+
+Provide a fallback definition for these when they are not already
+defined.
+
+Fixes: 9c47f66748381ecb ("perf trace beauty fcntl: Basic 'arg' beautifier")
+Reviewed-by: Ian Rogers <irogers@google.com>
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: James Clark <james.clark@linaro.org>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Markus Mayer <mmayer@broadcom.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/trace/beauty/fcntl.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/tools/perf/trace/beauty/fcntl.c
++++ b/tools/perf/trace/beauty/fcntl.c
+@@ -9,6 +9,22 @@
+ #include <linux/kernel.h>
+ #include <linux/fcntl.h>
+ 
++#ifndef F_GET_RW_HINT
++#define F_GET_RW_HINT         (F_LINUX_SPECIFIC_BASE + 11)
++#endif
++
++#ifndef F_SET_RW_HINT
++#define F_SET_RW_HINT         (F_LINUX_SPECIFIC_BASE + 12)
++#endif
++
++#ifndef F_GET_FILE_RW_HINT
++#define F_GET_FILE_RW_HINT    (F_LINUX_SPECIFIC_BASE + 13)
++#endif
++
++#ifndef F_SET_FILE_RW_HINT
++#define F_SET_FILE_RW_HINT    (F_LINUX_SPECIFIC_BASE + 14)
++#endif
++
+ static size_t fcntl__scnprintf_getfd(unsigned long val, char *bf, size_t size, bool show_prefix)
+ {
+       return val ? scnprintf(bf, size, "%s", "0") :

diff --git a/queue-7.1/series b/queue-7.1/series
index f12a1c6c3671490ada71b04c4c1ce4e0a17bf2d1..86a91d0e71ff391c63e20ba1f2558b081412c3ce 100644 (file)
--- a/queue-7.1/series
+++ b/queue-7.1/series
@@ -3,3 +3,5 @@ rust-str-clean-unused-import-for-rust-1.98.patch
 userfaultfd-gate-must_wait-writability-check-on-pte_.patch
 net-sched-dualpi2-fix-gso-backlog-accounting.patch
 mm-khugepaged-write-all-dirty-file-folios-when-colla.patch
+slab-recognize-gfp-parameter-as-optional-in-kernel-doc.patch
+perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch

diff --git a/queue-7.1/slab-recognize-gfp-parameter-as-optional-in-kernel-doc.patch b/queue-7.1/slab-recognize-gfp-parameter-as-optional-in-kernel-doc.patch
new file mode 100644 (file)
index 0000000..4a4ae6c
--- /dev/null
+++ b/queue-7.1/slab-recognize-gfp-parameter-as-optional-in-kernel-doc.patch
@@ -0,0 +1,57 @@
+From 7b5f5865fb11e60edd03c5e063e2d228b7062317 Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Wed, 17 Jun 2026 09:31:25 -0700
+Subject: slab: recognize @GFP parameter as optional in kernel-doc
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 7b5f5865fb11e60edd03c5e063e2d228b7062317 upstream.
+
+Since the @GFP parameter in kmalloc_obj() etc. is now optional, change
+the kernel-doc to indicate that it is optional. This avoids kernel-doc
+warnings:
+
+WARNING: include/linux/slab.h:1101 Excess function parameter 'GFP' description in 'kmalloc_obj'
+WARNING: include/linux/slab.h:1113 Excess function parameter 'GFP' description in 'kmalloc_objs'
+WARNING: include/linux/slab.h:1128 Excess function parameter 'GFP' description in 'kmalloc_flex'
+
+Fixes: e19e1b480ac7 ("add default_gfp() helper macro and use it in the new *alloc_obj() helpers")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Harry Yoo (Oracle) <harry@kernel.org>
+Link: https://patch.msgid.link/20260617163125.2716279-1-rdunlap@infradead.org
+Signed-off-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
+Signed-off-by: Eric Biggers <ebiggers@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/slab.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -1000,7 +1000,7 @@ void *kmalloc_nolock_noprof(size_t size,
+ /**
+  * kmalloc_obj - Allocate a single instance of the given type
+  * @VAR_OR_TYPE: Variable or type to allocate.
+- * @GFP: GFP flags for the allocation.
++ * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified).
+  *
+  * Returns: newly allocated pointer to a @VAR_OR_TYPE on success, or NULL
+  * on failure.
+@@ -1012,7 +1012,7 @@ void *kmalloc_nolock_noprof(size_t size,
+  * kmalloc_objs - Allocate an array of the given type
+  * @VAR_OR_TYPE: Variable or type to allocate an array of.
+  * @COUNT: How many elements in the array.
+- * @GFP: GFP flags for the allocation.
++ * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified).
+  *
+  * Returns: newly allocated pointer to array of @VAR_OR_TYPE on success,
+  * or NULL on failure.
+@@ -1025,7 +1025,7 @@ void *kmalloc_nolock_noprof(size_t size,
+  * @VAR_OR_TYPE: Variable or type to allocate (with its flex array).
+  * @FAM: The name of the flexible array member of the structure.
+  * @COUNT: How many flexible array member elements are desired.
+- * @GFP: GFP flags for the allocation.
++ * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified).
+  *
+  * Returns: newly allocated pointer to @VAR_OR_TYPE on success, NULL on
+  * failure. If @FAM has been annotated with __counted_by(), the allocation