[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: d9ff882b54f99f96787fa3df7cd938966843c418 WARNING: Author mismatch between patch and upstream commit: Backport author: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxxxxxx> Commit author: Damien Le Moal <dlemoal@xxxxxxxxxx> Status in newer kernel trees: 6.11.y | Present (exact SHA1) 6.6.y | Present (different SHA1: e0aba0c6d521) 6.1.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-20 07:50:08.726024900 -0500 +++ /tmp/tmp.mzeJOcYvZi 2024-11-20 07:50:08.723707071 -0500 @@ -1,3 +1,5 @@ +commit d9ff882b54f99f96787fa3df7cd938966843c418 upstream. + When powering on a null_blk device that is not already on, the return value ret that is initialized to be count is reused to check the return value of null_add_dev(), leading to nullb_device_power_store() to return @@ -10,15 +12,17 @@ Reviewed-by: Kanchan Joshi <joshi.k@xxxxxxxxxxx> Link: https://lore.kernel.org/r/20240527043445.235267-1-dlemoal@xxxxxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> +Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> +Signed-off-by: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxx> --- drivers/block/null_blk/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c -index eb023d2673693..631dca2e4e844 100644 +index e838eed4aacf..e66cace433cb 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c -@@ -494,6 +494,7 @@ static ssize_t nullb_device_power_store(struct config_item *item, +@@ -470,6 +470,7 @@ static ssize_t nullb_device_power_store(struct config_item *item, set_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags); dev->power = newp; @@ -26,3 +30,6 @@ } else if (dev->power && !newp) { if (test_and_clear_bit(NULLB_DEV_FL_UP, &dev->flags)) { dev->power = newp; +-- +2.43.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |
