FAILED: patch "[PATCH] parisc: Fix asm operand number out of range build error in" failed to apply to 6.1-stable tree

PATCH [email protected] 2 participants 5 messages Dec 9, 2023 – Dec 11, 2023

Subsystems (2)

Stable branch PA-RISC architecture

lore

Share & tools

lore

[email protected]

author maintainer

2023-12-09 12:34 UTC #0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 487635756198cad563feb47539c6a37ea57f1dae
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023120949-waged-entail-7b6b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

487635756198 ("parisc: Fix asm operand number out of range build error in bug table") 43266838515d ("parisc: Reduce size of the bug_table on 64-bit kernel by half") fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 487635756198cad563feb47539c6a37ea57f1dae Mon Sep 17 00:00:00 2001
From: Helge Deller <[email protected]>
Date: Mon, 27 Nov 2023 10:39:26 +0100
Subject: [PATCH] parisc: Fix asm operand number out of range build error in
bug table

Build is broken if CONFIG_DEBUG_BUGVERBOSE=n.
Fix it be using the correct asm operand number.

Signed-off-by Helge Deller <[email protected]>

Reported-by Linux Kernel Functional Testing <[email protected]>

Fixes fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")

Cc [email protected] # v6.0+

arch/parisc/include/asm/bug.h +1 -1

index 1641ff9a8b83..833555f74ffa 100644
@@ -71,7 +71,7 @@
 		asm volatile("\n"					\
 			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
 			     "\t.pushsection __bug_table,\"a\"\n"	\
-			     "\t.align %2\n"				\
+			     "\t.align 4\n"				\
 			     "2:\t" __BUG_REL(1b) "\n"			\
 			     "\t.short %0\n"				\
 			     "\t.blockz %1-4-2\n"			\

Helge Deller

maintainer

2023-12-10 16:43 UTC #1 lore raw

Quoted 5 lines · On 12/9/23 13:33, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Right, it does not apply, and does NOT need to be backported.

So, please just ignore/drop it for 6.1 and 6.6 stable series.

Thanks!
Helge

Quoted 50 lines

To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 487635756198cad563feb47539c6a37ea57f1dae
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023120949-waged-entail-7b6b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
487635756198 ("parisc: Fix asm operand number out of range build error in bug table") 43266838515d ("parisc: Reduce size of the bug_table on 64-bit kernel by half") fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 487635756198cad563feb47539c6a37ea57f1dae Mon Sep 17 00:00:00 2001
From: Helge Deller <[email protected]>
Date: Mon, 27 Nov 2023 10:39:26 +0100
Subject: [PATCH] parisc: Fix asm operand number out of range build error in
bug table
Build is broken if CONFIG_DEBUG_BUGVERBOSE=n.
Fix it be using the correct asm operand number.
Signed-off-by Helge Deller <[email protected]>
Reported-by Linux Kernel Functional Testing <[email protected]>
Fixes fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
Cc [email protected] # v6.0+
arch/parisc/include/asm/bug.h +1 -1
index 1641ff9a8b83..833555f74ffa 100644
@@ -71,7 +71,7 @@
  		asm volatile("\n"					\
  			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
  			     "\t.pushsection __bug_table,\"a\"\n"	\
-			     "\t.align %2\n"				\
+			     "\t.align 4\n"				\
  			     "2:\t" __BUG_REL(1b) "\n"			\
  			     "\t.short %0\n"				\
  			     "\t.blockz %1-4-2\n"			\

Greg KH

author maintainer

2023-12-11 06:44 UTC #2 lore raw

Quoted 8 lines · Helge Deller

Quoted 5 lines · On 12/9/23 13:33, [email protected] wrote:
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Right, it does not apply, and does NOT need to be backported.

Are you sure?

I ask because:

Quoted 2 lines

Quoted 2 lines
Fixes fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
Cc [email protected] # v6.0+

Both of those lines imply that yes, it should be backported. Are they incorrect?

thanks,

greg k-h

Helge Deller

maintainer

2023-12-11 14:56 UTC #3 lore raw

Hi Greg,

Quoted 12 lines · Greg KH

Quoted 8 lines · Helge Deller
Quoted 5 lines · On 12/9/23 13:33, [email protected] wrote:
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Right, it does not apply, and does NOT need to be backported.
Are you sure?

Quoted 7 lines

I ask because:
Quoted 2 lines
Quoted 2 lines
Fixes fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
Cc [email protected] # v6.0+
Both of those lines imply that yes, it should be backported. Are they incorrect?

Oh, I added a wrong "Fixes:" tag in the upstream commit. Instead it should be:

Fixes 43266838515d ("parisc: Reduce size of the bug_table on 64-bit kernel by half")

but this commit was originally not tagged for stable series.

I see Sasha pulled it nevertheless into stable-rc series, together with this commit
here: "parisc: Fix asm operand number out of range build error in".

So, either we keep both (as it is currently in stable-rc), or we drop both:
* parisc: Reduce size of the bug_table on 64-bit kernel by half
* parisc: Fix asm operand number out of range build error in

I'm fine with either option.

Helge

Greg KH

author maintainer

2023-12-11 16:48 UTC #4 lore raw

Quoted 27 lines · Helge Deller

Hi Greg,
Quoted 12 lines · Greg KH
Quoted 8 lines · Helge Deller
Quoted 5 lines · On 12/9/23 13:33, [email protected] wrote:
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Right, it does not apply, and does NOT need to be backported.
Are you sure?
Quoted 7 lines
I ask because:
Quoted 2 lines
Quoted 2 lines
Fixes fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
Cc [email protected] # v6.0+
Both of those lines imply that yes, it should be backported. Are they incorrect?
Oh, I added a wrong "Fixes:" tag in the upstream commit. Instead it should be:
Fixes 43266838515d ("parisc: Reduce size of the bug_table on 64-bit kernel by half")
but this commit was originally not tagged for stable series.

Quoted 8 lines

I see Sasha pulled it nevertheless into stable-rc series, together with this commit
here: "parisc: Fix asm operand number out of range build error in".
So, either we keep both (as it is currently in stable-rc), or we drop both:
* parisc: Reduce size of the bug_table on 64-bit kernel by half
* parisc: Fix asm operand number out of range build error in
I'm fine with either option.

I'll keep what we have in the stable queue, thanks for checking.

greg k-h