Commit 8cf7a16ee949204e71127fd7270d1b5ce5577005
Exists in
master
and in
16 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - Zorro bus cleanups and UAPI revival - Bootinfo cleanups and UAPI revival - Kexec support - Memory size reductions and bug fixes for multi-platform kernels - Polled interrupt support for Atari EtherNAT, EtherNEC and NetUSBee - Machine-specific random_get_entropy() - Defconfig updates and cleanups * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (46 commits) m68k/mac: Make SCC reset work more reliably m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts m68k: Update defconfigs for v3.13-rc1 m68k/defconfig: Enable EARLY_PRINTK m68k/mm: kmap spelling/grammar fixes m68k: Convert arch/m68k/kernel/traps.c to pr_*() m68k: Convert arch/m68k/mm/fault.c to pr_*() m68k/mm: Check for mm != NULL in do_page_fault() debug code m68k/defconfig: Disable /sbin/hotplug fork-bomb by default m68k/atari: Hide RTC_PORT() macro from rtc-cmos m68k/amiga,atari: Fix specifying multiple debug= parameters m68k/defconfig: Use ext4 for ext2/ext3 file systems m68k: Add support to export bootinfo in procfs m68k: Add kexec support m68k/mac: Mark Mac IIsi ADB driver BROKEN m68k/amiga: Provide mach_random_get_entropy() m68k: Add infrastructure for machine-specific random_get_entropy() m68k/atari: Call paging_init() before nf_init() m68k: Remove superfluous inclusions of <asm/bootinfo.h> m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h> ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 102 changed files Side-by-side Diff
- Documentation/zorro.txt
- arch/m68k/Kconfig
- arch/m68k/amiga/chipram.c
- arch/m68k/amiga/config.c
- arch/m68k/amiga/platform.c
- arch/m68k/apollo/config.c
- arch/m68k/atari/ataints.c
- arch/m68k/atari/config.c
- arch/m68k/atari/debug.c
- arch/m68k/bvme6000/config.c
- arch/m68k/configs/amiga_defconfig
- arch/m68k/configs/apollo_defconfig
- arch/m68k/configs/atari_defconfig
- arch/m68k/configs/bvme6000_defconfig
- arch/m68k/configs/hp300_defconfig
- arch/m68k/configs/mac_defconfig
- arch/m68k/configs/multi_defconfig
- arch/m68k/configs/mvme147_defconfig
- arch/m68k/configs/mvme16x_defconfig
- arch/m68k/configs/q40_defconfig
- arch/m68k/configs/sun3_defconfig
- arch/m68k/configs/sun3x_defconfig
- arch/m68k/emu/natfeat.c
- arch/m68k/hp300/config.c
- arch/m68k/include/asm/amigahw.h
- arch/m68k/include/asm/apollohw.h
- arch/m68k/include/asm/atarihw.h
- arch/m68k/include/asm/bootinfo.h
- arch/m68k/include/asm/hp300hw.h
- arch/m68k/include/asm/kexec.h
- arch/m68k/include/asm/macintosh.h
- arch/m68k/include/asm/mc146818rtc.h
- arch/m68k/include/asm/mvme16xhw.h
- arch/m68k/include/asm/setup.h
- arch/m68k/include/asm/timex.h
- arch/m68k/include/uapi/asm/Kbuild
- arch/m68k/include/uapi/asm/bootinfo-amiga.h
- arch/m68k/include/uapi/asm/bootinfo-apollo.h
- arch/m68k/include/uapi/asm/bootinfo-atari.h
- arch/m68k/include/uapi/asm/bootinfo-hp300.h
- arch/m68k/include/uapi/asm/bootinfo-mac.h
- arch/m68k/include/uapi/asm/bootinfo-q40.h
- arch/m68k/include/uapi/asm/bootinfo-vme.h
- arch/m68k/include/uapi/asm/bootinfo.h
- arch/m68k/include/uapi/asm/setup.h
- arch/m68k/kernel/Makefile
- arch/m68k/kernel/asm-offsets.c
- arch/m68k/kernel/bootinfo_proc.c
- arch/m68k/kernel/head.S
- arch/m68k/kernel/machine_kexec.c
- arch/m68k/kernel/relocate_kernel.S
- arch/m68k/kernel/setup_mm.c
- arch/m68k/kernel/time.c
- arch/m68k/kernel/traps.c
- arch/m68k/mac/config.c
- arch/m68k/mac/iop.c
- arch/m68k/mac/misc.c
- arch/m68k/mac/oss.c
- arch/m68k/mac/psc.c
- arch/m68k/mac/via.c
- arch/m68k/mm/fault.c
- arch/m68k/mm/init.c
- arch/m68k/mm/kmap.c
- arch/m68k/mm/motorola.c
- arch/m68k/mvme147/config.c
- arch/m68k/mvme16x/config.c
- arch/m68k/q40/config.c
- arch/m68k/sun3/dvma.c
- arch/m68k/sun3/mmu_emu.c
- arch/m68k/sun3/sun3dvma.c
- arch/m68k/sun3x/prom.c
- drivers/block/z2ram.c
- drivers/ide/buddha.c
- drivers/macintosh/Kconfig
- drivers/net/ethernet/8390/hydra.c
- drivers/net/ethernet/8390/zorro8390.c
- drivers/net/ethernet/amd/a2065.c
- drivers/net/ethernet/amd/ariadne.c
- drivers/net/ethernet/natsemi/macsonic.c
- drivers/parport/parport_mfc3.c
- drivers/scsi/a2091.c
- drivers/scsi/a3000.c
- drivers/scsi/a4000t.c
- drivers/scsi/gvp11.c
- drivers/scsi/zorro7xx.c
- drivers/video/amifb.c
- drivers/video/cirrusfb.c
- drivers/video/macfb.c
- drivers/video/valkyriefb.c
- drivers/zorro/Makefile
- drivers/zorro/names.c
- drivers/zorro/proc.c
- drivers/zorro/zorro-driver.c
- drivers/zorro/zorro-sysfs.c
- drivers/zorro/zorro.c
- drivers/zorro/zorro.h
- include/linux/zorro.h
- include/linux/zorro_ids.h
- include/uapi/linux/Kbuild
- include/uapi/linux/kexec.h
- include/uapi/linux/zorro.h
- include/uapi/linux/zorro_ids.h