Re: Patch "powerpc: do not build ppc_save_regs.o always" has been added to the 6.15-stable tree
On 10. 06. 25, 13:56, Sasha Levin wrote:
This is a note to let you know that I've just added the patch titled
powerpc: do not build ppc_save_regs.o alwaysto the 6.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...
Please drop this from all trees. It was correctly broken. The whole if was removed later by 93bd4a80efeb521314485a06d8c21157240497bb.
The filename of the patch is: powerpc-do-not-build-ppc_save_regs.o-always.patch and it can be found in the queue-6.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.
commit 242c2ba3f16d92cd81c309725550f6c723833ae3 Author: Jiri Slaby (SUSE) jirislaby@kernel.org Date: Thu Apr 17 12:53:05 2025 +0200
powerpc: do not build ppc_save_regs.o always [ Upstream commit 497b7794aef03d525a5be05ae78dd7137c6861a5 ] The Fixes commit below tried to add CONFIG_PPC_BOOK3S to one of the conditions to enable the build of ppc_save_regs.o. But it failed to do so, in fact. The commit omitted to add a dollar sign. Therefore, ppc_save_regs.o is built always these days (as "(CONFIG_PPC_BOOK3S)" is never an empty string). Fix this by adding the missing dollar sign. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Fixes: fc2a5a6161a2 ("powerpc/64s: ppc_save_regs is now needed for all 64s builds") Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20250417105305.397128-1-jirislaby@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 6ac621155ec3c..0c26b2412d173 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -160,7 +160,7 @@ endif obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o -ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),) +ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)$(CONFIG_PPC_BOOK3S),) obj-y += ppc_save_regs.o endif
Le 11/06/2025 à 06:15, Jiri Slaby a écrit :
On 10. 06. 25, 13:56, Sasha Levin wrote:
This is a note to let you know that I've just added the patch titled
powerpc: do not build ppc_save_regs.o always
to the 6.15-stable tree which can be found at: https://eur01.safelinks.protection.outlook.com/? url=http%3A%2F%2Fwww.kernel.org%2Fgit%2F%3Fp%3Dlinux%2Fkernel%2Fgit%2Fstable%2Fstable-queue.git%3Ba%3Dsummary&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7Cf9c2453dd6154212e43a08dda89ea845%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C638852121563909145%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=ckwC5j7O2j%2FATCggT3jwcKl3K5HRVpwA7DxjZUGnwZg%3D&reserved=0
Please drop this from all trees. It was correctly broken. The whole if was removed later by 93bd4a80efeb521314485a06d8c21157240497bb.
Isn't it better to keep it and add 93bd4a80efeb ("powerpc/kernel: Fix ppc_save_regs inclusion in build") instead of droping it and keep a bad test that works by chance ?
Christophe
The filename of the patch is: powerpc-do-not-build-ppc_save_regs.o-always.patch and it can be found in the queue-6.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.
commit 242c2ba3f16d92cd81c309725550f6c723833ae3 Author: Jiri Slaby (SUSE) jirislaby@kernel.org Date: Thu Apr 17 12:53:05 2025 +0200
powerpc: do not build ppc_save_regs.o always [ Upstream commit 497b7794aef03d525a5be05ae78dd7137c6861a5 ] The Fixes commit below tried to add CONFIG_PPC_BOOK3S to one of the conditions to enable the build of ppc_save_regs.o. But it failed to do so, in fact. The commit omitted to add a dollar sign. Therefore, ppc_save_regs.o is built always these days (as "(CONFIG_PPC_BOOK3S)" is never an empty string). Fix this by adding the missing dollar sign. Signed-off-by: Jiri Slaby (SUSE) jirislaby@kernel.org Fixes: fc2a5a6161a2 ("powerpc/64s: ppc_save_regs is now needed for all 64s builds") Acked-by: Stephen Rothwell sfr@canb.auug.org.au Signed-off-by: Madhavan Srinivasan maddy@linux.ibm.com Link: https://eur01.safelinks.protection.outlook.com/? url=https%3A%2F%2Fpatch.msgid.link%2F20250417105305.397128-1- jirislaby%40kernel.org&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7Cf9c2453dd6154212e43a08dda89ea845%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C638852121563928665%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=z4VKRS6xdEjQb0KWlyAaZD7Oykeqdou4ji8bb56yShY%3D&reserved=0 Signed-off-by: Sasha Levin sashal@kernel.org
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 6ac621155ec3c..0c26b2412d173 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -160,7 +160,7 @@ endif obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o -ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),) +ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)$(CONFIG_PPC_BOOK3S),) obj-y += ppc_save_regs.o endif
On 11. 06. 25, 7:39, Christophe Leroy wrote:
Le 11/06/2025 à 06:15, Jiri Slaby a écrit :
On 10. 06. 25, 13:56, Sasha Levin wrote:
This is a note to let you know that I've just added the patch titled
powerpc: do not build ppc_save_regs.o always
to the 6.15-stable tree which can be found at: https://eur01.safelinks.protection.outlook.com/? url=http%3A%2F%2Fwww.kernel.org%2Fgit%2F%3Fp%3Dlinux%2Fkernel%2Fgit%2Fstable%2Fstable-queue.git%3Ba%3Dsummary&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7Cf9c2453dd6154212e43a08dda89ea845%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C638852121563909145%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=ckwC5j7O2j%2FATCggT3jwcKl3K5HRVpwA7DxjZUGnwZg%3D&reserved=0
Please drop this from all trees. It was correctly broken. The whole if was removed later by 93bd4a80efeb521314485a06d8c21157240497bb.
Isn't it better to keep it and add 93bd4a80efeb ("powerpc/kernel: Fix ppc_save_regs inclusion in build") instead of droping it and keep a bad test that works by chance ?
Makes sense to me too (it worked by a chance for almost a decade). So all or nothing...
thanks,
On Wed, Jun 11, 2025 at 12:15:07PM +0200, Jiri Slaby wrote:
On 11. 06. 25, 7:39, Christophe Leroy wrote:
Le 11/06/2025 à 06:15, Jiri Slaby a écrit :
On 10. 06. 25, 13:56, Sasha Levin wrote:
This is a note to let you know that I've just added the patch titled
powerpc: do not build ppc_save_regs.o always
to the 6.15-stable tree which can be found at: https://eur01.safelinks.protection.outlook.com/? url=http%3A%2F%2Fwww.kernel.org%2Fgit%2F%3Fp%3Dlinux%2Fkernel%2Fgit%2Fstable%2Fstable-queue.git%3Ba%3Dsummary&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7Cf9c2453dd6154212e43a08dda89ea845%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C638852121563909145%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=ckwC5j7O2j%2FATCggT3jwcKl3K5HRVpwA7DxjZUGnwZg%3D&reserved=0
Please drop this from all trees. It was correctly broken. The whole if was removed later by 93bd4a80efeb521314485a06d8c21157240497bb.
Isn't it better to keep it and add 93bd4a80efeb ("powerpc/kernel: Fix ppc_save_regs inclusion in build") instead of droping it and keep a bad test that works by chance ?
Makes sense to me too (it worked by a chance for almost a decade). So all or nothing...
Ok, I've done that now, thanks.
greg k-h
linux-stable-mirror@lists.linaro.org
-
Christophe Leroy -
Greg KH -
Jiri Slaby