Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "I meant to sent that earlier but got swamped with other things, so here are some powerpc fixes for 3.6. A few regression fixes and some bug fixes that I deemed should still make it. There's a FSL update from Kumar with a bunch of defconfig updates along with a few embedded fixes. I also reverted my g5_defconfig update that I merged earlier as it was completely busted, not too sure what happened there, I'll do a new one later." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: Revert "powerpc: Update g5_defconfig" powerpc/perf: Use pmc_overflow() to detect rolled back events powerpc: Fix VMX in interrupt check in POWER7 copy loops powerpc: POWER7 copy_to_user/copy_from_user patch applied twice powerpc: Fix personality handling in ppc64_personality() powerpc/dma-iommu: Fix IOMMU window check powerpc: Remove unnecessary ifdefs powerpc/kgdb: Restore current_thread_info properly powerpc/kgdb: Bail out of KGDB when we've been triggered powerpc/kgdb: Do not set kgdb_single_step on ppc powerpc/mpic_msgr: Add missing includes powerpc: Fix null pointer deref in perf hardware breakpoints powerpc: Fixup whitespace in xmon powerpc: Fix xmon dl command for new printk implementation powerpc/fsl: fix "Failed to mount /dev: No such device" errors powerpc/fsl: update defconfigs booke/wdt: some ioctls do not return values properly powerpc/p4080ds: dts - add usb controller version info and port0 powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS powerpc/fsl-pci: Only scan PCI bus if configured as a host
Showing
- arch/powerpc/boot/dts/fsl/p4080si-post.dtsi 7 additions, 0 deletionsarch/powerpc/boot/dts/fsl/p4080si-post.dtsi
- arch/powerpc/configs/85xx/p1023rds_defconfig 10 additions, 21 deletionsarch/powerpc/configs/85xx/p1023rds_defconfig
- arch/powerpc/configs/corenet32_smp_defconfig 9 additions, 20 deletionsarch/powerpc/configs/corenet32_smp_defconfig
- arch/powerpc/configs/corenet64_smp_defconfig 1 addition, 0 deletionsarch/powerpc/configs/corenet64_smp_defconfig
- arch/powerpc/configs/g5_defconfig 73 additions, 30 deletionsarch/powerpc/configs/g5_defconfig
- arch/powerpc/configs/mpc83xx_defconfig 5 additions, 13 deletionsarch/powerpc/configs/mpc83xx_defconfig
- arch/powerpc/configs/mpc85xx_defconfig 9 additions, 24 deletionsarch/powerpc/configs/mpc85xx_defconfig
- arch/powerpc/configs/mpc85xx_smp_defconfig 8 additions, 24 deletionsarch/powerpc/configs/mpc85xx_smp_defconfig
- arch/powerpc/include/asm/cputable.h 0 additions, 2 deletionsarch/powerpc/include/asm/cputable.h
- arch/powerpc/include/asm/mpic_msgr.h 1 addition, 0 deletionsarch/powerpc/include/asm/mpic_msgr.h
- arch/powerpc/kernel/dma-iommu.c 4 additions, 5 deletionsarch/powerpc/kernel/dma-iommu.c
- arch/powerpc/kernel/hw_breakpoint.c 1 addition, 1 deletionarch/powerpc/kernel/hw_breakpoint.c
- arch/powerpc/kernel/kgdb.c 24 additions, 3 deletionsarch/powerpc/kernel/kgdb.c
- arch/powerpc/kernel/syscalls.c 4 additions, 4 deletionsarch/powerpc/kernel/syscalls.c
- arch/powerpc/lib/copyuser_power7.S 2 additions, 33 deletionsarch/powerpc/lib/copyuser_power7.S
- arch/powerpc/lib/memcpy_power7.S 2 additions, 2 deletionsarch/powerpc/lib/memcpy_power7.S
- arch/powerpc/perf/core-book3s.c 1 addition, 1 deletionarch/powerpc/perf/core-book3s.c
- arch/powerpc/sysdev/fsl_pci.c 8 additions, 5 deletionsarch/powerpc/sysdev/fsl_pci.c
- arch/powerpc/sysdev/mpic_msgr.c 3 additions, 0 deletionsarch/powerpc/sysdev/mpic_msgr.c
- arch/powerpc/xmon/xmon.c 34 additions, 50 deletionsarch/powerpc/xmon/xmon.c
Loading
Please register or sign in to comment