Skip to content

GitLab

Switch branch/tag
History Find file
Clone
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Linus Torvalds authored 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Fix assembler constraint to prevent overeager gcc optimisation
  mac_esp: rename irq
  mac_scsi: dont enable mac_scsi irq before requesting it
  macfb: fix black and white modes
  m68k/irq: Remove obsolete IRQ_FLG_* definitions

Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.
0dbfe8dd
Name Last commit Last update
..
amiga treewide: convert uses of ATTRIB_NORETURN to __noreturn
apollo m68k/irq: Remove obsolete support for user vector interrupt fixups
atari m68k: Fix assembler constraint to prevent overeager gcc optimisation
bvme6000 m68k/irq: Remove obsolete support for user vector interrupt fixups
configs m68k/serial: Remove references to obsolete serial config options
emu m68k: Initconst section fixes
fpsp040 Fix common misspellings
hp300 m68k/hp300: Export hp300_ledstate
ifpsp060 Fix common misspellings
include/asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
lib m68k: modify user space access functions to support ColdFire CPUs
mac m68k/mac: cleanup macro case
math-emu m68k/math-emu: Remove unnecessary code
mm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
mvme147 m68k/irq: Remove obsolete support for user vector interrupt fixups
mvme16x m68k/mvme16x: Add support for EARLY_PRINTK
platform Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
q40 m68k/irq: Remove obsolete m68k irq framework
sun3 m68k/irq: Remove obsolete support for user vector interrupt fixups
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
tools/amiga Convert files to UTF-8 and some cleanups
Kconfig cpu: Register a generic CPU device on architectures that currently do not
Kconfig.bus m68k: Revive lost DIO bus config option
Kconfig.cpu m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled
Kconfig.debug Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Kconfig.devices m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
Kconfig.machine m68k/Kconfig: Separate classic m68k and coldfire early
Makefile m68k: merge mmu and non-mmu arch Makefiles
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script