[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251011174334.GA2929946@ax162>
Date: Sat, 11 Oct 2025 10:43:34 -0700
From: Nathan Chancellor <nathan@...nel.org>
To: Borislav Petkov <bp@...en8.de>,
Linus Torvalds <torvalds@...ux-foundation.org>
Cc: x86-ml <x86@...nel.org>, lkml <linux-kernel@...r.kernel.org>,
Kees Cook <kees@...nel.org>
Subject: Re: [GIT PULL] x86/core for v6.18-rc1
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
Powered by blists - more mailing lists