Changes in Kconfig.machine

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/m68k/Kconfig.machine

090748e62f57a80286b2fcc32fe2be069f891200 - Merge tag 'm68k-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Thu, 16 Apr 2026 17:11:01 +0200

Merge tag 'm68k-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68kPull m68k updates from Geert Uytterhoeven: - Add support for QEMU virt-ctrl, and use it for system reset and power off on the virt platform - defconfig updates - Miscellaneous fixes and improvements* tag 'm68k-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: virt: Switch to qemu-virt-ctrl driver power: reset: Add QEMU virt-ctrl driver m68k: defconfig: Update defconfigs for v7.0-rc1 m68k: emu: Replace unbounded sprintf() in nfhd_init_one() m68k: uapi: Add ucontext.h m68k: defconfig: hp300: Enable monochrome and 16-color linux logos m68k: q40: Remove commented out code List of files: /linux/arch/m68k/Kconfig.machine

56f295853f38d3202c20fd0d98939e7a4c56c3fb - m68k: virt: Switch to qemu-virt-ctrl driver

Sun, 12 Apr 2026 23:19:52 +0200

m68k: virt: Switch to qemu-virt-ctrl driverRegister the "qemu-virt-ctrl" platform device during boardinitialization to utilize the new generic power/reset driver.Consequently, remove the legacy reset and power-off implementationsspecific to the virt machine. The platform's mach_reset callback isupdated to call do_kernel_restart(), bridging the legacy m68k rebootpath to the generic kernel restart handler framework for this machine.To prevent any regressions in reboot or power-off functionality whenthe driver is not built-in, explicitly select POWER_RESET andPOWER_RESET_QEMU_VIRT_CTRL for the VIRT machine in Kconfig.machine.Signed-off-by: Kuan-Wei Chiu Reviewed-by: Geert Uytterhoeven Link: https://patch.msgid.link/20260412211952.3564033-3-visitorckw@gmail.comSigned-off-by: Geert Uytterhoeven List of files: /linux/arch/m68k/Kconfig.machine

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/arch/m68k/Kconfig.machine

60675d4ca1ef0857e44eba5849b74a3a998d0c0f - Merge branch 'linus' into x86/mm, to pick up fixes

Fri, 20 Dec 2024 10:25:44 +0100

Merge branch 'linus' into x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/m68k/Kconfig.machine

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/arch/m68k/Kconfig.machine

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/arch/m68k/Kconfig.machine

c5fb51b71788926feef0d07f30c8af1d5e4af1a6 - Merge remote-tracking branch 'pm/opp/linux-next' into HEAD

Fri, 03 Jan 2025 16:13:45 +0100

Merge remote-tracking branch 'pm/opp/linux-next' into HEADMerge pm/opp tree to get dev_pm_opp_get_bw()Signed-off-by: Rob Clark List of files: /linux/arch/m68k/Kconfig.machine

e7f0a3a6f7339af55f1ca2c27131739d75569c08 - Merge drm/drm-next into drm-intel-next

Wed, 11 Dec 2024 21:06:05 +0100

Merge drm/drm-next into drm-intel-nextCatching up with 6.13-rc2.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/m68k/Kconfig.machine

8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda - Merge drm/drm-next into drm-xe-next

Mon, 02 Dec 2024 17:22:11 +0100

Merge drm/drm-next into drm-xe-nextA backmerge to get the PMT preparation work formerging the BMG PMT support.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/m68k/Kconfig.machine

3aba2eba84e0219fb66061359052be81bd883d53 - Merge drm/drm-next into drm-misc-next

Mon, 02 Dec 2024 12:44:18 +0100

Merge drm/drm-next into drm-misc-nextKickstart 6.14 cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/m68k/Kconfig.machine

bcfd5f644c5b933cfb3c488220e40a03e011e8a4 - Merge tag 'v6.13-rc1' into perf/core, to refresh the branch

Mon, 02 Dec 2024 11:52:59 +0100

Merge tag 'v6.13-rc1' into perf/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/arch/m68k/Kconfig.machine

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

Thu, 05 Dec 2024 18:09:29 +0100

Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.13A few small fixes for v6.13, all system specific - the biggest thing isthe fix for jack handling over suspend on some Intel laptops. List of files: /linux/arch/m68k/Kconfig.machine

9aa4c37f71b9a0a4f51692fbb874888c139805ce - Merge tag 'm68k-for-v6.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Tue, 19 Nov 2024 03:00:18 +0100

Merge tag 'm68k-for-v6.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68kPull m68k updates from Geert Uytterhoeven: - Revive SCSI and early console support on MVME147 - Fix early kernel parameters using static keys - Prevent and improve handling of kernel configurations that lack specific platform, CPU, or MMU support, to avoid build failures - Miscellaneous fixes and improvements - Defconfig updates* tag 'm68k-for-v6.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.12-rc1 m68k: mvme147: Reinstate early console m68k: Make sure NR_IRQS is never zero m68k: Select M68020 as fallback for classic m68k: Move Sun 3 into a top-level platform option m68k: kernel: Use str_read_write() helper function m68k: Initialize jump labels early during setup_arch() m68k: mvme147: Fix SCSI controller IRQ numbers m68k: mvme147: Make mvme147_sched_init() __init List of files: /linux/arch/m68k/Kconfig.machine

5d42a685734ca9ef8802a745c55e28d417dbe254 - m68k: Move Sun 3 into a top-level platform option

Wed, 30 Oct 2024 20:56:13 +0100

m68k: Move Sun 3 into a top-level platform optionIt is possible to select an m68k MMU build but not actually enable anyof the three MMU options, which then results in a build failure: arch/m68k/include/asm/page.h:10:25: error: 'CONFIG_PAGE_SHIFT' undeclared here (not in a function); did you mean 'CONFIG_LOG_BUF_SHIFT'?Change the Kconfig selection to ensure that exactly one of the threeoptions is always enabled whenever an MMU-enabled kernel is built, butmoving CONFIG_SUN3 into a top-level option next to M68KCLASSIC andCOLDFIRE.All defconfig files should keep working without changes, butalldefconfig now builds support for the classic MMU.Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202408032138.P7sBvIns-lkp@intel.com/Signed-off-by: Arnd Bergmann Acked-by: Greg Ungerer Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/20241030195638.22542-1-arnd@kernel.orgSigned-off-by: Geert Uytterhoeven List of files: /linux/arch/m68k/Kconfig.machine

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/arch/m68k/Kconfig.machine

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/arch/m68k/Kconfig.machine

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/arch/m68k/Kconfig.machine

0ea5c948cb64bab5bc7a5516774eb8536f05aa0d - Merge drm/drm-next into drm-intel-next

Mon, 15 Jan 2024 08:38:05 +0100

Merge drm/drm-next into drm-intel-nextBackmerge to bring Xe driver to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/arch/m68k/Kconfig.machine

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/arch/m68k/Kconfig.machine