Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...

5 files changed, 14 insertions, 15 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 561ccca7b1a7..e7fb8edb629b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -332,7 +332,7 @@ config SWIOTLB
 
 config HOTPLUG_CPU
         bool "Support for enabling/disabling CPUs"
-        depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \
+        depends on SMP && HOTPLUG && (PPC_PSERIES || \
         PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
         ---help---
           Say Y here to be able to disable and re-enable individual
@@ -354,8 +354,8 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
         def_bool y
 
 config KEXEC
-        bool "kexec system call (EXPERIMENTAL)"
-        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL
+        bool "kexec system call"
+        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -850,8 +850,8 @@ config LOWMEM_CAM_NUM
         default 3
 
 config DYNAMIC_MEMSTART
-        bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x)
+        bool "Enable page aligned dynamic load address for kernel"
+        depends on ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x)
         select NONSTATIC_KERNEL
         help
           This option enables the kernel to be loaded at any page aligned
@@ -868,8 +868,8 @@ config DYNAMIC_MEMSTART
           This option is overridden by CONFIG_RELOCATABLE
 
 config RELOCATABLE
-        bool "Build a relocatable kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x
+        bool "Build a relocatable kernel"
+        depends on ADVANCED_OPTIONS && FLATMEM && 44x
         select NONSTATIC_KERNEL
         help
           This builds a kernel image that is capable of running at the
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 4730c953f435..63c67ec72e43 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -41,7 +41,7 @@ config KVM_BOOK3S_PR
 
 config KVM_BOOK3S_32
         tristate "KVM support for PowerPC book3s_32 processors"
-        depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT
+        depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT
         select KVM
         select KVM_BOOK3S_32_HANDLER
         select KVM_BOOK3S_PR
@@ -56,7 +56,7 @@ config KVM_BOOK3S_32
 
 config KVM_BOOK3S_64
         tristate "KVM support for PowerPC book3s_64 processors"
-        depends on EXPERIMENTAL && PPC_BOOK3S_64
+        depends on PPC_BOOK3S_64
         select KVM_BOOK3S_64_HANDLER
         select KVM
         ---help---
@@ -97,7 +97,7 @@ config KVM_BOOKE_HV
 
 config KVM_440
         bool "KVM support for PowerPC 440 processors"
-        depends on EXPERIMENTAL && 44x
+        depends on 44x
         select KVM
         select KVM_MMIO
         ---help---
@@ -122,7 +122,7 @@ config KVM_EXIT_TIMING
 
 config KVM_E500V2
         bool "KVM support for PowerPC E500v2 processors"
-        depends on EXPERIMENTAL && E500 && !PPC_E500MC
+        depends on E500 && !PPC_E500MC
         select KVM
         select KVM_MMIO
         select MMU_NOTIFIER
@@ -137,7 +137,7 @@ config KVM_E500V2
 
 config KVM_E500MC
         bool "KVM support for PowerPC E500MC/E5500 processors"
-        depends on EXPERIMENTAL && PPC_E500MC
+        depends on PPC_E500MC
         select KVM
         select KVM_MMIO
         select KVM_BOOKE_HV
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 02d02a09942d..92ab60a62711 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -277,7 +277,6 @@ config P5040_DS
 
 config PPC_QEMU_E500
         bool "QEMU generic e500 platform"
-        depends on EXPERIMENTAL
         select DEFAULT_UIMAGE
         help
           This option enables support for running as a QEMU guest using
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 2e7ff0c5cf42..53aaefeb3386 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -124,7 +124,7 @@ config CBE_CPUFREQ
 
 config CBE_CPUFREQ_PMI_ENABLE
         bool "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ && EXPERIMENTAL
+        depends on CBE_CPUFREQ
         default n
         help
           Select this, if you want to use the PMI interface
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 46b7f0232523..e87c19473973 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -48,7 +48,7 @@ config PS3_HTAB_SIZE
           system will have optimal runtime performance.
 
 config PS3_DYNAMIC_DMA
-        depends on PPC_PS3 && EXPERIMENTAL
+        depends on PPC_PS3
         bool "PS3 Platform dynamic DMA page table management"
         default n
         help