From: Nathan Chancellor <nathan@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Nicolas Schier <nsc@kernel.org>,
linux-kbuild@vger.kernel.org
Subject: Re: [GIT PULL] Kbuild / Kconfig updates for 7.4
Date: Wed, 21 Oct 2026 11:47:23 -0700 [thread overview]
Message-ID: <20261021184723.GA2608581@ax162> (raw)
In-Reply-To: <20261018035817.GA2365306@ax162>
On Sat, Oct 17, 2026 at 08:58:17PM -0700, Nathan Chancellor wrote:
> Hi Linus,
>
> Please pull the following Kbuild and Kconfig updates for 7.4, with
> full details available in the signed tag.
...
> kbuild: Mark the gzip recipes as recursive
Another conflict was reported in -next between this change and
commit c437950dceb8 ("alpha: add self-extracting compressed kernel boot
stub") in your current tree.
https://lore.kernel.org/atibhAMcgKle37-g@sirena.co.uk/
Mark's resolution is not correct though. Discard the conflicting change
in arch/alpha/boot/Makefile (i.e., the first hunk) then apply the fix
from the kbuild commit to arch/alpha/boot/compressed/Makefile. See my
current merge for -next for the expected result.
https://git.kernel.org/kbuild/c/83deedcf85af511dc120b3cd8ee597d211cdf2fb
Also, there will be another conflict with the rust tree in init/Kconfig
similar to the random one, Mark's resolution looks correct to me.
https://lore.kernel.org/atit3cSBFwe9cDY7@sirena.co.uk/
--
Cheers,
Nathan
next prev parent reply other threads:[~2026-10-21 18:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-18 3:58 Nathan Chancellor
2026-10-21 18:47 ` Nathan Chancellor [this message]
2026-10-21 21:04 ` pr-tracker-bot
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=20261021184723.GA2608581@ax162 \
--to=nathan@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nsc@kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®