Commit 090748e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull 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
parents 948ef73f 56f29585

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -21592,6 +21592,12 @@ S: Maintained 
F:	drivers/firmware/qemu_fw_cfg.c

F:	include/uapi/linux/qemu_fw_cfg.h









QEMU VIRT MACHINE SYSTEM CONTROLLER DRIVER









M:	Kuan-Wei Chiu <visitorckw@gmail.com>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	drivers/power/reset/qemu-virt-ctrl.c

















QLOGIC QL41xxx FCOE DRIVER









M:	Saurav Kashyap <skashyap@marvell.com>









M:	Javed Hasan <jhasan@marvell.com>

























arch/m68k/Kconfig.machine



+2
−0






























Original line number
Diff line number
Diff line







@@ -133,6 +133,8 @@ config VIRT







	select GOLDFISH_TIMER









	select GOLDFISH_TTY









	select M68040









	select POWER_RESET









	select POWER_RESET_QEMU_VIRT_CTRL









	select RTC_CLASS









	select RTC_DRV_GOLDFISH









	select TTY
































arch/m68k/configs/amiga_defconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -386,6 +386,8 @@ CONFIG_FB_FM2=y







CONFIG_FRAMEBUFFER_CONSOLE=y









CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y









CONFIG_LOGO=y









CONFIG_LOGO_LINUX_MONO=y









CONFIG_LOGO_LINUX_VGA16=y









CONFIG_SOUND=m









CONFIG_DMASOUND_PAULA=m









CONFIG_HID=m
































arch/m68k/configs/apollo_defconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -344,7 +344,7 @@ CONFIG_FB=y







CONFIG_FRAMEBUFFER_CONSOLE=y









CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y









CONFIG_LOGO=y









# CONFIG_LOGO_LINUX_VGA16 is not set









CONFIG_LOGO_LINUX_MONO=y









# CONFIG_LOGO_LINUX_CLUT224 is not set









CONFIG_HID=m









CONFIG_HIDRAW=y
































arch/m68k/configs/atari_defconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -366,6 +366,8 @@ CONFIG_FB=y







CONFIG_FB_ATARI=y









CONFIG_FRAMEBUFFER_CONSOLE=y









CONFIG_LOGO=y









CONFIG_LOGO_LINUX_MONO=y









CONFIG_LOGO_LINUX_VGA16=y









CONFIG_SOUND=m









CONFIG_DMASOUND_ATARI=m









CONFIG_HID=m