On Wed, Apr 19, 2023 at 09:27:04AM +0200, Greg Kroah-Hartman wrote:
On Tue, Apr 18, 2023 at 02:10:54PM +0100, Conor Dooley wrote:
On Tue, Apr 18, 2023 at 02:23:05PM +0200, Greg Kroah-Hartman wrote:
From: Alexandre Ghiti alexghiti@rivosinc.com
[ Upstream commit ef69d2559fe91f23d27a3d6fd640b5641787d22e ]
Hey Greg,
Please check out e3a6656c-0ec4-9d54-b262-1af08c292ed5@microchip.com (I can't find a lore link for stable-commit@vger stuff) as I am not sure whether it is okay to backport this in isolation.
I'm confused, what is needed to be done here?
Originally I got an email saying that some patches had failed to apply: FAILED: patch "[PATCH] riscv: Move early dtb mapping into the fixmap region" failed to apply to 5.15-stable tree 2023041706-esophagus-evacuate-b5a7@gregkh FAILED: patch "[PATCH] riscv: Move early dtb mapping into the fixmap region" failed to apply to 6.1-stable tree 2023041708-sinless-rectangle-f480@gregkh
I replied to: Patch "riscv: No need to relocate the dtb as it lies in the fixmap region" has been added to the 5.15-stable tree 2023041741-dirtiness-canon-8104@gregkh Where I said that without the failed patches, the above should not be applied to 5.15.y or 6.1y. You said you would drop it from all stable trees.
However, this patch ("riscv: Move early dtb mapping into the fixmap region") did end up getting applied to 6.1.y and 6.2.y, despite what the email I got said for 6.1.y!
I don't think that either of the patches can be backported in isolation, so either:
a) drop ("riscv: Move early dtb mapping into the fixmap region") from all stable trees & queue it up alongside (riscv: No need to relocate the dtb as it lies in the fixmap region) for the next stable update
b) pick ("riscv: No need to relocate the dtb as it lies in the fixmap region") up in such a way that it sits immediately after ("riscv: No need to relocate the dtb as it lies in the fixmap region") in the history
I am the original reporter of the issue and I have a workaround in place so personally the backport is not urgent (to me at least), so which option you go for doesn't matter to me.
In case it helps, the patch to pick up for b) is commit 1b50f956c8fe ("riscv: No need to relocate the dtb as it lies in the fixmap region") upstream.
HTH, Conor