public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Nathan Chancellor <nathan@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: Re: FAILED: patch "[PATCH] ARM: 9443/1: Require linker to support KEEP within OVERLAY" failed to apply to 6.13-stable tree
Date: Thu, 10 Apr 2025 11:53:18 -0400	[thread overview]
Message-ID: <20250409224452-9768aaa037ccf842@stable.kernel.org> (raw)
In-Reply-To: <20250408152300.GA3301081@ax162>

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: e7607f7d6d81af71dcc5171278aadccc94d277cd

Status in newer kernel trees:
6.14.y | Present (different SHA1: 9309361bbaee)

Note: The patch differs from the upstream commit:
---
1:  e7607f7d6d81a ! 1:  c49dffd98b600 ARM: 9443/1: Require linker to support KEEP within OVERLAY for DCE
    @@ Metadata
     Author: Nathan Chancellor <nathan@kernel.org>
     
      ## Commit message ##
    -    ARM: 9443/1: Require linker to support KEEP within OVERLAY for DCE
    +    FAILED: patch "[PATCH] ARM: 9443/1: Require linker to support KEEP within OVERLAY" failed to apply to 6.13-stable tree
    +
    +    On Tue, Apr 08, 2025 at 11:15:05AM +0200, gregkh@linuxfoundation.org wrote:
    +    ...
    +    > ------------------ original commit in Linus's tree ------------------
    +    >
    +    > From e7607f7d6d81af71dcc5171278aadccc94d277cd Mon Sep 17 00:00:00 2001
    +    > From: Nathan Chancellor <nathan@kernel.org>
    +    > Date: Thu, 20 Mar 2025 22:33:49 +0100
    +    > Subject: [PATCH] ARM: 9443/1: Require linker to support KEEP within OVERLAY
    +    >  for DCE
    +
    +    Attached is a backport for 6.12 and 6.13. This change is necessary for
    +    "ARM: 9444/1: add KEEP() keyword to ARM_VECTORS", as pointed out at
    +    https://lore.kernel.org/71339b92-5292-48b7-8a45-addbac43ee32@sirena.org.uk/.
    +
    +    Cheers,
    +    Nathan
    +
    +    From 4800091d0ce47de62d584cda0c4c4eb2eedbe794 Mon Sep 17 00:00:00 2001
    +    From: Nathan Chancellor <nathan@kernel.org>
    +    Date: Thu, 20 Mar 2025 22:33:49 +0100
    +    Subject: [PATCH 6.12 and 6.13] ARM: 9443/1: Require linker to support KEEP
    +     within OVERLAY for DCE
    +
    +    commit e7607f7d6d81af71dcc5171278aadccc94d277cd upstream.
     
         ld.lld prior to 21.0.0 does not support using the KEEP keyword within an
         overlay description, which may be needed to avoid discarding necessary
    @@ Commit message
         Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
         Signed-off-by: Nathan Chancellor <nathan@kernel.org>
         Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    +    [nathan: Fix conflict in init/Kconfig due to lack of RUSTC symbols]
    +    Signed-off-by: Nathan Chancellor <nathan@kernel.org>
     
      ## arch/arm/Kconfig ##
     @@ arch/arm/Kconfig: config ARM
    @@ init/Kconfig: config CC_HAS_COUNTED_BY
     +	# https://github.com/llvm/llvm-project/pull/130661
     +	def_bool LD_IS_BFD || LLD_VERSION >= 210000
     +
    - config RUSTC_HAS_COERCE_POINTEE
    - 	def_bool RUSTC_VERSION >= 108400
    - 
    + config PAHOLE_VERSION
    + 	int
    + 	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.13.y       |  Success    |  Success   |

      parent reply	other threads:[~2025-04-10 15:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-08  9:15 FAILED: patch "[PATCH] ARM: 9443/1: Require linker to support KEEP within OVERLAY" failed to apply to 6.13-stable tree gregkh
2025-04-08 15:23 ` Nathan Chancellor
2025-04-08 15:27   ` Greg KH
2025-04-10 15:53   ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250409224452-9768aaa037ccf842@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=nathan@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox