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()
  ...

3 files changed, 9 insertions, 11 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 9c833c585871..87f720037ff7 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -644,7 +644,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
-        depends on SUPERH32 && EXPERIMENTAL && MMU
+        depends on SUPERH32 && MMU
         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
@@ -661,7 +661,7 @@ config KEXEC
 
 config CRASH_DUMP
         bool "kernel crash dumps (EXPERIMENTAL)"
-        depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
+        depends on SUPERH32 && BROKEN_ON_SMP
         help
           Generate crash dump after being started by kexec.
           This should be normally only set in special crash dump kernels
@@ -675,7 +675,7 @@ config CRASH_DUMP
 
 config KEXEC_JUMP
         bool "kexec jump (EXPERIMENTAL)"
-        depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL
+        depends on SUPERH32 && KEXEC && HIBERNATION
         help
           Jump between original kernel and kexeced kernel and invoke
           code via KEXEC
@@ -709,7 +709,7 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on SUPERH32 && EXPERIMENTAL
+        depends on SUPERH32
         help
           This option turns on the -fstack-protector GCC feature. This
           feature puts, at the beginning of functions, a canary value on
@@ -760,7 +760,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-        depends on SMP && HOTPLUG && EXPERIMENTAL
+        depends on SMP && HOTPLUG
         help
           Say Y here to experiment with turning CPUs off and on.  CPUs
           can be controlled through /sys/devices/system/cpu.
@@ -839,7 +839,7 @@ config ENTRY_OFFSET
 
 config ROMIMAGE_MMCIF
         bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
-        depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+        depends on CPU_SUBTYPE_SH7724
         help
           Say Y here to include experimental MMCIF loading code in
           romImage. With this enabled it is possible to write the romImage
@@ -925,7 +925,6 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
 
 source "kernel/power/Kconfig"
 
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
index 770ff2d5b94d..05b518e90cf7 100644
--- a/arch/sh/Kconfig.cpu
+++ b/arch/sh/Kconfig.cpu
@@ -33,7 +33,7 @@ config SH64_FPU_DENORM_FLUSH
 config SH_FPU_EMU
         def_bool n
         prompt "FPU emulation support"
-        depends on !SH_FPU && EXPERIMENTAL
+        depends on !SH_FPU
         help
           Selecting this option will enable support for software FPU emulation.
           Most SH-3 users will want to say Y here, whereas most SH-4 users will
@@ -68,7 +68,6 @@ config SH_STORE_QUEUES
 
 config SPECULATIVE_EXECUTION
         bool "Speculative subroutine return"
-        depends on EXPERIMENTAL
         depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786
         help
           This enables support for a speculative instruction fetch for
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 0f7c852f355c..5a43a871e097 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -83,7 +83,7 @@ config 32BIT
 
 config PMB
         bool "Support 32-bit physical addressing through PMB"
-        depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP
+        depends on MMU && CPU_SH4A && !CPU_SH4AL_DSP
         select 32BIT
         select UNCACHED_MAPPING
         help
@@ -110,7 +110,7 @@ config VSYSCALL
 
 config NUMA
         bool "Non Uniform Memory Access (NUMA) Support"
-        depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL
+        depends on MMU && SYS_SUPPORTS_NUMA
         select ARCH_WANT_NUMA_VARIABLE_LOCALITY
         default n
         help