Commit 79c4581262e225a7c96d88b632b05ab3b5e9a52c
Exists in
master
and in
39 other branches
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits) powerpc: Remove unused 'protect4gb' boot parameter powerpc: Build-in e1000e for pseries & ppc64_defconfig powerpc/pseries: Make request_ras_irqs() available to other pseries code powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim powerpc: Use smt_snooze_delay=-1 to always busy loop powerpc: Remove check of ibm,smt-snooze-delay OF property powerpc/kdump: Fix race in kdump shutdown powerpc/kexec: Fix race in kexec shutdown powerpc/kexec: Speedup kexec hash PTE tear down powerpc/pseries: Add hcall to read 4 ptes at a time in real mode powerpc: Use more accurate limit for first segment memory allocations powerpc/kdump: Use chip->shutdown to disable IRQs powerpc/kdump: CPUs assume the context of the oopsing CPU powerpc/crashdump: Do not fail on NULL pointer dereferencing powerpc/eeh: Fix oops when probing in early boot powerpc/pci: Check devices status property when scanning OF tree powerpc/vio: Switch VIO Bus PM to use generic helpers powerpc: Avoid bad relocations in iSeries code powerpc: Use common cpu_die (fixes SMP+SUSPEND build) ...
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 118 changed files Side-by-side Diff
- Documentation/powerpc/dts-bindings/4xx/reboot.txt
- Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt
- arch/powerpc/Kconfig
- arch/powerpc/Kconfig.debug
- arch/powerpc/boot/Makefile
- arch/powerpc/boot/dts/iss4xx-mpic.dts
- arch/powerpc/boot/dts/iss4xx.dts
- arch/powerpc/boot/dts/mpc8315erdb.dts
- arch/powerpc/boot/dts/mpc8377_rdb.dts
- arch/powerpc/boot/dts/mpc8378_rdb.dts
- arch/powerpc/boot/dts/mpc8379_rdb.dts
- arch/powerpc/boot/dts/p1020rdb.dts
- arch/powerpc/boot/treeboot-iss4xx.c
- arch/powerpc/boot/wrapper
- arch/powerpc/configs/44x/iss476-smp_defconfig
- arch/powerpc/configs/ppc64_defconfig
- arch/powerpc/configs/pseries_defconfig
- arch/powerpc/include/asm/cache.h
- arch/powerpc/include/asm/cputable.h
- arch/powerpc/include/asm/hvcall.h
- arch/powerpc/include/asm/kexec.h
- arch/powerpc/include/asm/mmu-44x.h
- arch/powerpc/include/asm/mmu.h
- arch/powerpc/include/asm/mmzone.h
- arch/powerpc/include/asm/mpic.h
- arch/powerpc/include/asm/paca.h
- arch/powerpc/include/asm/parport.h
- arch/powerpc/include/asm/pgalloc-64.h
- arch/powerpc/include/asm/pgtable-ppc32.h
- arch/powerpc/include/asm/ptrace.h
- arch/powerpc/include/asm/reg.h
- arch/powerpc/include/asm/reg_booke.h
- arch/powerpc/include/asm/smp.h
- arch/powerpc/include/asm/topology.h
- arch/powerpc/kernel/asm-offsets.c
- arch/powerpc/kernel/cputable.c
- arch/powerpc/kernel/crash.c
- arch/powerpc/kernel/entry_32.S
- arch/powerpc/kernel/exceptions-64s.S
- arch/powerpc/kernel/head_44x.S
- arch/powerpc/kernel/head_8xx.S
- arch/powerpc/kernel/head_booke.h
- arch/powerpc/kernel/head_fsl_booke.S
- arch/powerpc/kernel/iommu.c
- arch/powerpc/kernel/irq.c
- arch/powerpc/kernel/kprobes.c
- arch/powerpc/kernel/lparcfg.c
- arch/powerpc/kernel/machine_kexec_64.c
- arch/powerpc/kernel/misc_32.S
- arch/powerpc/kernel/misc_64.S
- arch/powerpc/kernel/paca.c
- arch/powerpc/kernel/pci_of_scan.c
- arch/powerpc/kernel/process.c
- arch/powerpc/kernel/ptrace.c
- arch/powerpc/kernel/rtas.c
- arch/powerpc/kernel/rtasd.c
- arch/powerpc/kernel/setup-common.c
- arch/powerpc/kernel/setup_64.c
- arch/powerpc/kernel/smp.c
- arch/powerpc/kernel/sysfs.c
- arch/powerpc/kernel/traps.c
- arch/powerpc/kernel/vio.c
- arch/powerpc/lib/string.S
- arch/powerpc/mm/44x_mmu.c
- arch/powerpc/mm/fault.c
- arch/powerpc/mm/fsl_booke_mmu.c
- arch/powerpc/mm/init_64.c
- arch/powerpc/mm/mmu_context_nohash.c
- arch/powerpc/mm/mmu_decl.h
- arch/powerpc/mm/numa.c
- arch/powerpc/mm/pgtable_32.c
- arch/powerpc/mm/pgtable_64.c
- arch/powerpc/mm/tlb_nohash_low.S
- arch/powerpc/platforms/44x/Kconfig
- arch/powerpc/platforms/44x/Makefile
- arch/powerpc/platforms/44x/iss4xx.c
- arch/powerpc/platforms/83xx/mpc831x_rdb.c
- arch/powerpc/platforms/83xx/mpc837x_rdb.c
- arch/powerpc/platforms/86xx/mpc8610_hpcd.c
- arch/powerpc/platforms/Kconfig.cputype
- arch/powerpc/platforms/cell/cbe_cpufreq.c
- arch/powerpc/platforms/iseries/exception.S
- arch/powerpc/platforms/iseries/pci.c
- arch/powerpc/platforms/iseries/smp.c
- arch/powerpc/platforms/pasemi/cpufreq.c
- arch/powerpc/platforms/powermac/cpufreq_64.c
- arch/powerpc/platforms/powermac/low_i2c.c
- arch/powerpc/platforms/powermac/pmac.h
- arch/powerpc/platforms/powermac/setup.c
- arch/powerpc/platforms/powermac/smp.c
- arch/powerpc/platforms/pseries/Makefile
- arch/powerpc/platforms/pseries/dlpar.c
- arch/powerpc/platforms/pseries/eeh.c
- arch/powerpc/platforms/pseries/event_sources.c
- arch/powerpc/platforms/pseries/hotplug-cpu.c
- arch/powerpc/platforms/pseries/hvCall.S
- arch/powerpc/platforms/pseries/lpar.c
- arch/powerpc/platforms/pseries/plpar_wrappers.h
- arch/powerpc/platforms/pseries/pseries.h
- arch/powerpc/platforms/pseries/ras.c
- arch/powerpc/platforms/pseries/setup.c
- arch/powerpc/platforms/pseries/smp.c
- arch/powerpc/platforms/pseries/xics.c
- arch/powerpc/sysdev/mpc8xxx_gpio.c
- arch/powerpc/sysdev/mpic.c
- arch/powerpc/sysdev/ppc4xx_soc.c
- drivers/macintosh/macio-adb.c
- drivers/macintosh/smu.c
- drivers/macintosh/therm_adt746x.c
- drivers/macintosh/windfarm_pm81.c
- drivers/macintosh/windfarm_pm91.c
- drivers/misc/Makefile
- drivers/misc/hdpuftrs/Makefile
- drivers/misc/hdpuftrs/hdpu_cpustate.c
- drivers/misc/hdpuftrs/hdpu_nexus.c
- drivers/serial/mpsc.c
- include/linux/hdpu_features.h
- sound/aoa/core/gpio-pmf.c