From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E99C4187C for ; Sat, 9 Dec 2023 12:34:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="aRLp3WDp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66829C433C8; Sat, 9 Dec 2023 12:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1702125240; bh=MqyUs0uQTnC7KI+hHgIDlaKWdKEFwv8YKvir+2ve8/0=; h=Subject:To:Cc:From:Date:From; b=aRLp3WDpRE5HHP362w47c1mV7Kcu4yzPUWtF5Dec63iPNVHgPJcl8rDusN7OorsaB Eq6auEdULmKPfea9QdnmwiV7t4MPmo6mtxADmeHy5pFjR6FFQ0HZVS5SP2hUurxZC5 JdkW6rov4/qm0bsARKKq2iTy5TTtzKC/cqncpQtc= Subject: FAILED: patch "[PATCH] parisc: Fix asm operand number out of range build error in" failed to apply to 6.1-stable tree To: deller@gmx.de,lkft@linaro.org Cc: From: Date: Sat, 09 Dec 2023 13:33:50 +0100 Message-ID: <2023120949-waged-entail-7b6b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit 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 . 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 # git commit -s git send-email --to '' --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 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 Reported-by: Linux Kernel Functional Testing Fixes: fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table") Cc: stable@vger.kernel.org # 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" \