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

1 files changed, 10 insertions, 14 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 4f7fe7270e37..3f2eb57cc51d 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -50,16 +50,15 @@ config IPV6_ROUTER_PREF
           If unsure, say N.
 
 config IPV6_ROUTE_INFO
-        bool "IPv6: Route Information (RFC 4191) support (EXPERIMENTAL)"
-        depends on IPV6_ROUTER_PREF && EXPERIMENTAL
+        bool "IPv6: Route Information (RFC 4191) support"
+        depends on IPV6_ROUTER_PREF
         ---help---
           This is experimental support of Route Information.
 
           If unsure, say N.
 
 config IPV6_OPTIMISTIC_DAD
-        bool "IPv6: Enable RFC 4429 Optimistic DAD (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "IPv6: Enable RFC 4429 Optimistic DAD"
         ---help---
           This is experimental support for optimistic Duplicate
           Address Detection.  It allows for autoconfigured addresses
@@ -105,8 +104,7 @@ config INET6_IPCOMP
           If unsure, say Y.
 
 config IPV6_MIP6
-        tristate "IPv6: Mobility (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "IPv6: Mobility"
         select XFRM
         ---help---
           Support for IPv6 Mobility described in RFC 3775.
@@ -150,8 +148,7 @@ config INET6_XFRM_MODE_BEET
           If unsure, say Y.
 
 config INET6_XFRM_MODE_ROUTEOPTIMIZATION
-        tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "IPv6: MIPv6 route optimization mode"
         select XFRM
         ---help---
           Support for MIPv6 route optimization mode.
@@ -171,8 +168,8 @@ config IPV6_SIT
           Saying M here will produce a module called sit. If unsure, say Y.
 
 config IPV6_SIT_6RD
-        bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
-        depends on IPV6_SIT && EXPERIMENTAL
+        bool "IPv6: IPv6 Rapid Deployment (6RD)"
+        depends on IPV6_SIT
         default n
         ---help---
           IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon
@@ -219,7 +216,6 @@ config IPV6_GRE
 
 config IPV6_MULTIPLE_TABLES
         bool "IPv6: Multiple Routing Tables"
-        depends on EXPERIMENTAL
         select FIB_RULES
         ---help---
           Support multiple routing tables.
@@ -239,8 +235,8 @@ config IPV6_SUBTREES
           If unsure, say N.
 
 config IPV6_MROUTE
-        bool "IPv6: multicast routing (EXPERIMENTAL)"
-        depends on IPV6 && EXPERIMENTAL
+        bool "IPv6: multicast routing"
+        depends on IPV6
         ---help---
           Experimental support for IPv6 multicast forwarding.
           If unsure, say N.
@@ -260,7 +256,7 @@ config IPV6_MROUTE_MULTIPLE_TABLES
           If unsure, say N.
 
 config IPV6_PIMSM_V2
-        bool "IPv6: PIM-SM version 2 support (EXPERIMENTAL)"
+        bool "IPv6: PIM-SM version 2 support"
         depends on IPV6_MROUTE
         ---help---
           Support for IPv6 PIM multicast routing protocol PIM-SMv2.