Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits) powerpc/mpic: Fix mask/unmask timeout message powerpc/pseries: Add BNX2=m to defconfig powerpc: Enable 64kB pages and 1024 threads in pseries config powerpc: Disable mcount tracers in pseries defconfig powerpc/boot/dts: Install dts from the right directory powerpc: machine_check_generic is wrong on 64bit powerpc: Check RTAS extended log flag before checking length powerpc: Fix corruption when grabbing FWNMI data powerpc: Rework pseries machine check handler powerpc: Don't silently handle machine checks from userspace powerpc: Remove duplicate debugger hook in machine_check_exception powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check powerpc: Don't force MSR_RI in machine_check_exception powerpc: Print 32 bits of DSISR in show_regs powerpc/kdump: Disable ftrace during kexec powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare powerpc/kexec: Don't initialise kexec hooks to default handlers powerpc/kdump: Remove ppc_md.machine_crash_shutdown powerpc/kexec: Remove ppc_md.machine_kexec ...
Showing
- arch/powerpc/boot/Makefile 1 addition, 1 deletionarch/powerpc/boot/Makefile
- arch/powerpc/boot/dts/mpc8308rdb.dts 1 addition, 1 deletionarch/powerpc/boot/dts/mpc8308rdb.dts
- arch/powerpc/boot/dts/p1022ds.dts 2 additions, 2 deletionsarch/powerpc/boot/dts/p1022ds.dts
- arch/powerpc/configs/pseries_defconfig 4 additions, 3 deletionsarch/powerpc/configs/pseries_defconfig
- arch/powerpc/include/asm/feature-fixups.h 15 additions, 12 deletionsarch/powerpc/include/asm/feature-fixups.h
- arch/powerpc/include/asm/immap_qe.h 15 additions, 6 deletionsarch/powerpc/include/asm/immap_qe.h
- arch/powerpc/include/asm/irqflags.h 30 additions, 10 deletionsarch/powerpc/include/asm/irqflags.h
- arch/powerpc/include/asm/machdep.h 1 addition, 17 deletionsarch/powerpc/include/asm/machdep.h
- arch/powerpc/include/asm/reg.h 2 additions, 0 deletionsarch/powerpc/include/asm/reg.h
- arch/powerpc/include/asm/reg_booke.h 14 additions, 0 deletionsarch/powerpc/include/asm/reg_booke.h
- arch/powerpc/include/asm/spu.h 0 additions, 8 deletionsarch/powerpc/include/asm/spu.h
- arch/powerpc/kernel/cpu_setup_fsl_booke.S 6 additions, 0 deletionsarch/powerpc/kernel/cpu_setup_fsl_booke.S
- arch/powerpc/kernel/cputable.c 0 additions, 23 deletionsarch/powerpc/kernel/cputable.c
- arch/powerpc/kernel/crash.c 2 additions, 70 deletionsarch/powerpc/kernel/crash.c
- arch/powerpc/kernel/entry_32.S 11 additions, 0 deletionsarch/powerpc/kernel/entry_32.S
- arch/powerpc/kernel/machine_kexec.c 9 additions, 10 deletionsarch/powerpc/kernel/machine_kexec.c
- arch/powerpc/kernel/process.c 1 addition, 1 deletionarch/powerpc/kernel/process.c
- arch/powerpc/kernel/rtas_flash.c 6 additions, 47 deletionsarch/powerpc/kernel/rtas_flash.c
- arch/powerpc/kernel/rtasd.c 1 addition, 1 deletionarch/powerpc/kernel/rtasd.c
- arch/powerpc/kernel/time.c 20 additions, 5 deletionsarch/powerpc/kernel/time.c
Loading
Please register or sign in to comment