]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge tag 'hardening-fix1-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Oct 2025 20:04:44 +0000 (13:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Oct 2025 20:04:44 +0000 (13:04 -0700)
Pull hardening fixes from Kees Cook:

 - tools headers: rename missed CONFIG_CFI_CLANG in merge (Carlos
   Llamas)

 - kconfig: Avoid prompting for transitional symbols

* tag 'hardening-fix1-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  tools headers: kcfi: rename missed CONFIG_CFI_CLANG
  kconfig: Avoid prompting for transitional symbols


Trivial merge