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

2 files changed, 14 insertions, 44 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 7000d9657402..335a1f680c91 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -29,35 +29,8 @@ config BUILDTIME_EXTABLE_SORT
 menu "General setup"
 
 config EXPERIMENTAL
-        bool "Prompt for development and/or incomplete code/drivers"
-        ---help---
-          Some of the various things that Linux supports (such as network
-          drivers, file systems, network protocols, etc.) can be in a state
-          of development where the functionality, stability, or the level of
-          testing is not yet high enough for general use. This is usually
-          known as the "alpha-test" phase among developers. If a feature is
-          currently in alpha-test, then the developers usually discourage
-          uninformed widespread use of this feature by the general public to
-          avoid "Why doesn't this work?" type mail messages. However, active
-          testing and use of these systems is welcomed. Just be aware that it
-          may not meet the normal level of reliability or it may fail to work
-          in some special cases. Detailed bug reports from people familiar
-          with the kernel internals are usually welcomed by the developers
-          (before submitting bug reports, please read the documents
-          <file:README>, <file:MAINTAINERS>, <file:REPORTING-BUGS>,
-          <file:Documentation/BUG-HUNTING>, and
-          <file:Documentation/oops-tracing.txt> in the kernel source).
-
-          This option will also make obsoleted drivers available. These are
-          drivers that have been replaced by something else, and/or are
-          scheduled to be removed in a future kernel release.
-
-          Unless you intend to help test and develop a feature or driver that
-          falls into this category, or you have a situation that requires
-          using these features, you should probably say N here, which will
-          cause the configurator to present you with fewer choices. If
-          you say Y here, you will be offered the choice of using features or
-          drivers that are currently considered to be in the alpha-test phase.
+        bool
+        default y
 
 config BROKEN
         bool
@@ -243,7 +216,7 @@ config SYSVIPC_SYSCTL
 
 config POSIX_MQUEUE
         bool "POSIX Message Queues"
-        depends on NET && EXPERIMENTAL
+        depends on NET
         ---help---
           POSIX variant of message queues is a part of IPC. In POSIX message
           queues every message has a priority which decides about succession
@@ -410,7 +383,7 @@ config BSD_PROCESS_ACCT_V3
           at <http://www.gnu.org/software/acct/>.
 
 config TASKSTATS
-        bool "Export task/process statistics through netlink (EXPERIMENTAL)"
+        bool "Export task/process statistics through netlink"
         depends on NET
         default n
         help
@@ -423,7 +396,7 @@ config TASKSTATS
           Say N if unsure.
 
 config TASK_DELAY_ACCT
-        bool "Enable per-task delay accounting (EXPERIMENTAL)"
+        bool "Enable per-task delay accounting"
         depends on TASKSTATS
         help
           Collect information on time spent by a task waiting for system
@@ -434,7 +407,7 @@ config TASK_DELAY_ACCT
           Say N if unsure.
 
 config TASK_XACCT
-        bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+        bool "Enable extended accounting over taskstats"
         depends on TASKSTATS
         help
           Collect extended task accounting data and send the data
@@ -443,7 +416,7 @@ config TASK_XACCT
           Say N if unsure.
 
 config TASK_IO_ACCOUNTING
-        bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
+        bool "Enable per-task storage I/O accounting"
         depends on TASK_XACCT
         help
           Collect information on the number of bytes of storage I/O which this
@@ -907,8 +880,8 @@ config MEMCG_SWAP_ENABLED
           select this option (if, for some reason, they need to disable it
           then swapaccount=0 does the trick).
 config MEMCG_KMEM
-        bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
-        depends on MEMCG && EXPERIMENTAL
+        bool "Memory Resource Controller Kernel Memory accounting"
+        depends on MEMCG
         depends on SLUB || SLAB
         help
           The Kernel Memory extension for Memory Resource Controller can limit
@@ -920,7 +893,7 @@ config MEMCG_KMEM
 
 config CGROUP_HUGETLB
         bool "HugeTLB Resource Controller for Control Groups"
-        depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL
+        depends on RESOURCE_COUNTERS && HUGETLB_PAGE
         default n
         help
           Provides a cgroup Resource Controller for HugeTLB pages.
@@ -959,7 +932,6 @@ config FAIR_GROUP_SCHED
 
 config CFS_BANDWIDTH
         bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
-        depends on EXPERIMENTAL
         depends on FAIR_GROUP_SCHED
         default n
         help
@@ -971,7 +943,6 @@ config CFS_BANDWIDTH
 
 config RT_GROUP_SCHED
         bool "Group scheduling for SCHED_RR/FIFO"
-        depends on EXPERIMENTAL
         depends on CGROUP_SCHED
         default n
         help
@@ -1053,8 +1024,7 @@ config IPC_NS
           different IPC objects in different namespaces.
 
 config USER_NS
-        bool "User namespace (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "User namespace"
         depends on UIDGID_CONVERTED
         select UIDGID_STRICT_TYPE_CHECKS
 
@@ -1636,7 +1606,7 @@ config MODULE_UNLOAD
 
 config MODULE_FORCE_UNLOAD
         bool "Forced module unloading"
-        depends on MODULE_UNLOAD && EXPERIMENTAL
+        depends on MODULE_UNLOAD
         help
           This option allows you to force a module to unload, even if the
           kernel believes it is unsafe: the kernel will remove the module
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 1d1b6348f903..a2b49f2c1bd8 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -81,9 +81,9 @@ struct uuidcmp {
  *
  * Returns 1 if the device matches, and 0 otherwise.
  */
-static int match_dev_by_uuid(struct device *dev, void *data)
+static int match_dev_by_uuid(struct device *dev, const void *data)
 {
-        struct uuidcmp *cmp = data;
+        const struct uuidcmp *cmp = data;
         struct hd_struct *part = dev_to_part(dev);
 
         if (!part->info)