Changes in expected_stderr

a4a508df2aa34f8650afde54ea804321c618f45f - Merge tag 'v6.18' into next

Sat, 13 Dec 2025 09:18:20 +0000

Merge tag 'v6.18' into nextSync up with the mainline to bring in the latest APIs. List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

2ace52718376fdb56aca863da2eebe70d7e2ddb1 - Merge branch 'objtool/core'

Fri, 21 Nov 2025 10:21:20 +0000

Merge branch 'objtool/core'Bring in the UDB and objtool data annotations to avoid conflicts while further extending the bug exceptions.Signed-off-by: Peter Zijlstra List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

f39b6c468c52745dbca9a842d91c8373fda208ab - Merge tag 'v6.18-rc6' into for-linus

Tue, 18 Nov 2025 07:16:55 +0000

Merge tag 'v6.18-rc6' into for-linusSync up with the mainline to bring in definition ofINPUT_PROP_HAPTIC_TOUCHPAD. List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 12:47:30 +0000

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

ec2e0fb07d789976c601bec19ecced7a501c3705 - Merge tag 'asoc-fix-v6.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 16 Oct 2025 18:14:24 +0000

Merge tag 'asoc-fix-v6.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.18A moderately large collection of driver specific fixes, plus a few newquirks and device IDs. The NAU8821 changes are a little large but morein mechanical ways than in ways that are complex. List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

82ee50252dc891e3f3b32d923bb4f656d300b772 - Merge drm/drm-next into drm-xe-next

Tue, 14 Oct 2025 09:31:49 +0000

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.18-rc1.Signed-off-by: Thomas Hellström List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

48a710760e10a4f36e11233a21860796ba204b1e - Merge drm/drm-fixes into drm-misc-fixes

Tue, 14 Oct 2025 08:59:58 +0000

Merge drm/drm-fixes into drm-misc-fixesUpdating drm-misc-fixes to the state of v6.18-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

2acee98fcc61052d63fab4539fcb6ee677555645 - Merge drm/drm-next into drm-intel-next

Tue, 14 Oct 2025 07:37:11 +0000

Merge drm/drm-next into drm-intel-nextSync to v6.18-rc1.Signed-off-by: Jani Nikula List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

4f38da1f027ea2c9f01bb71daa7a299c191b6940 - spi: Merge up v6.18-rc1

Mon, 13 Oct 2025 12:32:13 +0000

spi: Merge up v6.18-rc1Ensure my CI has a sensible baseline. List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

9b966ae42235a88eaea714be09ff3d698535bdfe - Merge drm/drm-next into drm-misc-next

Mon, 13 Oct 2025 07:19:19 +0000

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of v6.18-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

a5ba183bdeeeedd5f5b683c02561072848258496 - Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Tue, 30 Sep 2025 00:48:27 +0000

Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linuxPull hardening updates from Kees Cook: "One notable addition is the creation of the 'transitional' keyword for kconfig so CONFIG renaming can go more smoothly. This has been a long-standing deficiency, and with the renaming of CONFIG_CFI_CLANG to CONFIG_CFI (since GCC will soon have KCFI support), this came up again. The breadth of the diffstat is mainly this renaming. - Clean up usage of TRAILING_OVERLAP() (Gustavo A. R. Silva) - lkdtm: fortify: Fix potential NULL dereference on kmalloc failure (Junjie Cao) - Add str_assert_deassert() helper (Lad Prabhakar) - gcc-plugins: Remove TODO_verify_il for GCC >= 16 - kconfig: Fix BrokenPipeError warnings in selftests - kconfig: Add transitional symbol attribute for migration support - kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI"* tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: lib/string_choices: Add str_assert_deassert() helper kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI kconfig: Add transitional symbol attribute for migration support kconfig: Fix BrokenPipeError warnings in selftests gcc-plugins: Remove TODO_verify_il for GCC >= 16 stddef: Introduce __TRAILING_OVERLAP() stddef: Remove token-pasting in TRAILING_OVERLAP() lkdtm: fortify: Fix potential NULL dereference on kmalloc failure List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr

f9afce4f32e9a120fc902fa6c9e0b90ad799a6ec - kconfig: Add transitional symbol attribute for migration support

Tue, 23 Sep 2025 21:34:18 +0000

kconfig: Add transitional symbol attribute for migration supportDuring kernel option migrations (e.g. CONFIG_CFI_CLANG to CONFIG_CFI),existing .config files need to maintain backward compatibility whilepreventing deprecated options from appearing in newly generatedconfigurations. This is challenging with existing Kconfig mechanismsbecause:1. Simply removing old options breaks existing .config files.2. Manually listing an option as "deprecated" leaves it needlessly visible and still writes them to new .config files.3. Using any method to remove visibility (.e.g no 'prompt', 'if n', etc) prevents the option from being processed at all.Add a "transitional" attribute that creates symbols which are:- Processed during configuration (can influence other symbols' defaults)- Hidden from user menus (no prompts appear)- Omitted from newly written .config files (gets migrated)- Restricted to only having help sections (no defaults, selects, etc) making it truly just a "prior value pass-through" option.The transitional syntax requires a type argument and prevents typeredefinition: config NEW_OPTION bool "New option" default OLD_OPTION config OLD_OPTION bool transitional help Transitional config for OLD_OPTION migration.This allows seamless migration: olddefconfig processes existingCONFIG_OLD_OPTION=y settings to enable CONFIG_NEW_OPTION=y, whileCONFIG_OLD_OPTION is omitted from newly generated .config files.Added positive and negative testing via "testconfig" make target.Co-developed-by: Vegard Nossum Signed-off-by: Vegard Nossum Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Link: https://lore.kernel.org/r/20250923213422.1105654-2-kees@kernel.orgSigned-off-by: Kees Cook List of files: /linux/scripts/kconfig/tests/err_transitional/expected_stderr