[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 95931a245b44ee04f3359ec432e73614d44d8b38 WARNING: Author mismatch between patch and upstream commit: Backport author: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxxxxxx> Commit author: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Status in newer kernel trees: 6.11.y | Present (exact SHA1) 6.6.y | Present (different SHA1: b2b02202f87d) 6.1.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-20 07:40:44.222155724 -0500 +++ /tmp/tmp.aIhRvR57Io 2024-11-20 07:40:44.215907652 -0500 @@ -1,3 +1,5 @@ +[ Upstream commit 95931a245b44ee04f3359ec432e73614d44d8b38 ] + ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). @@ -6,15 +8,16 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Link: https://lore.kernel.org/r/bf257b1078475a415cdc3344c6a750842946e367.1705222845.git.christophe.jaillet@xxxxxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> +Signed-off-by: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxx> --- drivers/block/null_blk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c -index 9f7695f00c2db..36755f263e8ec 100644 +index 4d78b5583dc6..f58778b57375 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c -@@ -1840,7 +1840,7 @@ static void null_del_dev(struct nullb *nullb) +@@ -1764,7 +1764,7 @@ static void null_del_dev(struct nullb *nullb) dev = nullb->dev; @@ -23,8 +26,8 @@ list_del_init(&nullb->list); -@@ -2174,7 +2174,7 @@ static int null_add_dev(struct nullb_device *dev) - blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q); +@@ -2103,7 +2103,7 @@ static int null_add_dev(struct nullb_device *dev) + blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q); mutex_lock(&lock); - rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL); @@ -32,3 +35,6 @@ if (rv < 0) { mutex_unlock(&lock); goto out_cleanup_zone; +-- +2.43.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |
