linux-stable/arch/powerpc/configs
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
  ...
2012-10-06 03:16:12 +09:00
..
40x Merge remote-tracking branch 'jwb/next' into next 2011-12-16 11:24:25 +11:00
44x powerpc: Rename mapping based RELOCATABLE to DYNAMIC_MEMSTART for BookE 2011-12-20 10:20:19 -05:00
52xx powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. 2011-09-29 15:36:33 +02:00
83xx powerpc/83xx: update defconfig for kmeter1 2012-07-10 07:07:20 -05:00
85xx powerpc/85xx: Enable USB support in p1023rds_defconfig 2012-09-19 08:38:16 -05:00
86xx ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
adder875_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
amigaone_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
c2k_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
cell_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
celleb_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
chroma_defconfig memcg: rename config variables 2012-07-31 18:42:43 -07:00
chrp32_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
corenet32_smp_defconfig powerpc/85xx: Add support for P5040DS board 2012-09-12 14:57:07 -05:00
corenet64_smp_defconfig powerpc/85xx: Add support for P5040DS board 2012-09-12 14:57:07 -05:00
ep88xc_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ep8248e_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
g5_defconfig Revert "powerpc: Update g5_defconfig" 2012-08-24 20:55:55 +10:00
gamecube_defconfig perf: Remove PERF_COUNTERS config option 2012-04-26 13:52:52 +02:00
holly_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
linkstation_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
maple_defconfig powerpc: Remove CONFIG_POWER4_ONLY 2012-04-30 15:37:26 +10:00
mgcoge_defconfig powerpc/82xx: add SPI support for mgcoge 2012-07-10 07:07:20 -05:00
mpc83xx_defconfig powerpc/fsl: fix "Failed to mount /dev: No such device" errors 2012-08-23 10:46:20 -05:00
mpc85xx_defconfig powerpc/85xx: introduce support for the Freescale / iVeia P1022RDK 2012-09-12 14:57:07 -05:00
mpc85xx_smp_defconfig powerpc/85xx: introduce support for the Freescale / iVeia P1022RDK 2012-09-12 14:57:07 -05:00
mpc86xx_defconfig powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
mpc512x_defconfig powerpc: update 512x-defconfig 2011-09-23 00:20:07 +02:00
mpc866_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc885_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc5200_defconfig powerpc/mpc5200: add options to mpc5200_defconfig 2012-03-21 10:40:28 +11:00
mpc7448_hpc2_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mpc8272_ads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pasemi_defconfig powerpc: Remove CONFIG_POWER4_ONLY 2012-04-30 15:37:26 +10:00
pmac32_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ppc6xx_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ppc40x_defconfig Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
ppc44x_defconfig powerpc/44x: Add mtd ndfc to the ppx44x defconfig 2011-11-25 10:06:00 +11:00
ppc64_defconfig Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2012-10-06 03:16:12 +09:00
ppc64e_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
pq2fads_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
prpmc2800_defconfig powerpc: Trim defconfigs 2010-08-09 11:19:16 +10:00
ps3_defconfig powerpc/ps3: Refresh ps3_defconfig 2012-04-24 18:18:01 -07:00
pseries_defconfig Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2012-10-06 03:16:12 +09:00
storcenter_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tqm8xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
wii_defconfig perf: Remove PERF_COUNTERS config option 2012-04-26 13:52:52 +02:00