You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 5f3d2f2e1a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Pull powerpc updates from Benjamin Herrenschmidt: "Some highlights in addition to the usual batch of fixes: - 64TB address space support for 64-bit processes by Aneesh Kumar - Gavin Shan did a major cleanup & re-organization of our EEH support code (IBM fancy PCI error handling & recovery infrastructure) which paves the way for supporting different platform backends, along with some rework of the PCIe code for the PowerNV platform in order to remove home made resource allocations and instead use the generic code (which is possible after some small improvements to it done by Gavin). - Uprobes support by Ananth N Mavinakayanahalli - A pile of embedded updates from Freescale folks, including new SoC and board supports, more KVM stuff including preparing for 64-bit BookE KVM support, ePAPR 1.1 updates, etc..." Fixup trivial conflicts in drivers/scsi/ipr.c * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits) powerpc/iommu: Fix multiple issues with IOMMU pools code powerpc: Fix VMX fix for memcpy case driver/mtd:IFC NAND:Initialise internal SRAM before any write powerpc/fsl-pci: use 'Header Type' to identify PCIE mode powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get powerpc: Remove tlb batching hack for nighthawk powerpc: Set paca->data_offset = 0 for boot cpu powerpc/perf: Sample only if SIAR-Valid bit is set in P7+ powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled powerpc/mpc85xx: Update interrupt handling for IFC controller powerpc/85xx: Enable USB support in p1023rds_defconfig powerpc/smp: Do not disable IPI interrupts during suspend powerpc/eeh: Fix crash on converting OF node to edev powerpc/eeh: Lock module while handling EEH event powerpc/kprobe: Don't emulate store when kprobe stwu r1 powerpc/kprobe: Complete kprobe and migrate exception frame powerpc/kprobe: Introduce a new thread flag powerpc: Remove unused __get_user64() and __put_user64() powerpc/eeh: Global mutex to protect PE tree powerpc/eeh: Remove EEH PE for normal PCI hotplug ...		13 years ago
..
boot	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
include	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
kernel	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
kvm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
lib	powerpc: Fix VMX fix for memcpy case	13 years ago
math-emu	powerpc/math_emu/efp: Look for errata handler when type mismatches	14 years ago
mm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
net	powerpc: Start using ___PPC_RA/B/S/T where necessary	13 years ago
oprofile	powerpc/oprofile: Fix marked events support on Power7+ not set.	13 years ago
perf	powerpc/perf: Sample only if SIAR-Valid bit is set in P7+	13 years ago
platforms	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
sysdev	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	13 years ago
xmon	powerpc: Add an xmon command to dump one or all pacas	13 years ago
Kconfig	Merge remote-tracking branch 'kumar/next' into next	13 years ago
Kconfig.debug	powerpc: IOMMU fault injection	13 years ago
Makefile	crypto: nx - move nx build to driver/crypto Makefile	13 years ago
relocs_check.pl	powerpc: Process dynamic relocations for kernel	13 years ago