On 12/9/23 13:33, gregkh@xxxxxxxxxxxxxxxxxxx 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 <stable@xxxxxxxxxxxxxxx>.
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
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 '<stable@xxxxxxxxxxxxxxx>' --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 <deller@xxxxxx> 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 <deller@xxxxxx> Reported-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx> Fixes: fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table") Cc: stable@xxxxxxxxxxxxxxx # v6.0+ diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h index 1641ff9a8b83..833555f74ffa 100644 --- a/arch/parisc/include/asm/bug.h +++ b/arch/parisc/include/asm/bug.h @@ -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" \
