6.12-stable patches

added patches:
	block-make-struct-rq_list-available-for-config_block.patch

diff --git a/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch b/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch
new file mode 100644 (file)
index 0000000..64d8180
--- /dev/null
+++ b/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch
@@ -0,0 +1,38 @@
+From 957860cbc1dc89f79f2acc193470224e350dfd03 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Fri, 15 Nov 2024 07:14:03 -0700
+Subject: block: make struct rq_list available for !CONFIG_BLOCK
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit 957860cbc1dc89f79f2acc193470224e350dfd03 upstream.
+
+A previous commit changed how requests are linked in the plug structure,
+but unlike the previous method, it uses a new type for it rather than
+struct request. The latter is available even for !CONFIG_BLOCK, while
+struct rq_list is now. Move it outside CONFIG_BLOCK.
+
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Fixes: a3396b99990d ("block: add a rq_list type")
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/blkdev.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -995,12 +995,12 @@ extern void blk_put_queue(struct request
+ 
+ void blk_mark_disk_dead(struct gendisk *disk);
+ 
+-#ifdef CONFIG_BLOCK
+ struct rq_list {
+       struct request *head;
+       struct request *tail;
+ };
+ 
++#ifdef CONFIG_BLOCK
+ /*
+  * blk_plug permits building a queue of related requests by holding the I/O
+  * fragments for a short period. This allows merging of sequential requests

diff --git a/queue-6.12/series b/queue-6.12/series
index 65edf685cd214b903328b47d953fde747c359ab2..c249b1be1d074900dbfc88512bd5b70f176f6e5d 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -220,3 +220,4 @@ selftests-bpf-freplace-tests-for-tracking-of-changes_packet_data.patch
 selftests-bpf-validate-that-tail-call-invalidates-packet-pointers.patch
 bpf-fix-null-dereference-when-computing-changes_pkt_data-of-prog-w-o-subprogs.patch
 selftests-bpf-extend-changes_pkt_data-with-cases-w-o-subprograms.patch
+block-make-struct-rq_list-available-for-config_block.patch