From: Nathan Chancellor <nathan@kernel.org>
To: Borislav Petkov <bp@alien8.de>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>,
Kees Cook <kees@kernel.org>
Subject: Re: [GIT PULL] x86/core for v6.18-rc1
Date: Sat, 11 Oct 2025 10:43:34 -0700 [thread overview]
Message-ID: <20251011174334.GA2929946@ax162> (raw)
In-Reply-To: <20251011134629.GAaOpftWmLdD6L7bJn@fat_crate.local>
On Sat, Oct 11, 2025 at 03:46:29PM +0200, Borislav Petkov wrote:
> please pull one more belated x86/core lineup for v6.18-rc1.
>
> The pile conflicts with your tree but not too badly. I've added a merge
> conflict resolution I've done locally, at the end of this mail to compare
> notes.
...
> Kees Cook (6):
> compiler_types.h: Move __nocfi out of compiler-specific header
Please do not forget about this semantic conflict during the merge.
https://lore.kernel.org/20251003221030.GA1162775@ax162/
Cheers,
Nathan
next prev parent reply other threads:[~2025-10-11 17:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-11 13:46 [GIT PULL] x86/core for v6.18-rc1 Borislav Petkov
2025-10-11 17:43 ` Nathan Chancellor [this message]
2025-10-11 20:30 ` Borislav Petkov
2025-10-11 18:39 ` 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=20251011174334.GA2929946@ax162 \
--to=nathan@kernel.org \
--cc=bp@alien8.de \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.