Fixes for all trees

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/block-make-bio_integrity_map_user-static-inline.patch b/queue-6.12/block-make-bio_integrity_map_user-static-inline.patch
new file mode 100644 (file)
index 0000000..3ebf32f
--- /dev/null
+++ b/queue-6.12/block-make-bio_integrity_map_user-static-inline.patch
@@ -0,0 +1,37 @@
+From 5ea3dda9ad1e7c2e68a4b96dc89922cd6c9f9690 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 29 Nov 2024 15:53:58 -0700
+Subject: block: make bio_integrity_map_user() static inline
+
+From: Jens Axboe <axboe@kernel.dk>
+
+[ Upstream commit 546d191427cf5cf3215529744c2ea8558f0279db ]
+
+If CONFIG_BLK_DEV_INTEGRITY isn't set, then the dummy helper must be
+static inline to avoid complaints about the function being unused.
+
+Fixes: fe8f4ca7107e ("block: modify bio_integrity_map_user to accept iov_iter as argument")
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202411300229.y7h60mDg-lkp@intel.com/
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/bio-integrity.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h
+index be91479b2c42d..53f6dbd2816e0 100644
+--- a/include/linux/bio-integrity.h
++++ b/include/linux/bio-integrity.h
+@@ -98,7 +98,7 @@ static inline void bioset_integrity_free(struct bio_set *bs)
+ {
+ }
+ 
+-static int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
++static inline int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
+ {
+       return -EINVAL;
+ }
+-- 
+2.53.0
+

diff --git a/queue-6.12/series b/queue-6.12/series
index 709e7011d937cdbb5169778fb659143da71f687f..43473169928bf3dc195dadfe19f14d6bcf137d40 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -268,3 +268,4 @@ pds_core-ensure-null-termination-for-firmware-versio.patch
 net-gro-don-t-merge-zcopy-skbs.patch
 loongarch-kprobes-fix-handling-of-fatal-unrecoverabl.patch
 landlock-fix-tcp-handling-of-short-af_unspec-address.patch
+block-make-bio_integrity_map_user-static-inline.patch