Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Feb 2013 20:05:51 +0000 (12:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Feb 2013 20:05:51 +0000 (12:05 -0800)
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()
  ...

53 files changed:
1  2 
arch/alpha/Kconfig
arch/arm/Kconfig
arch/blackfin/Kconfig
arch/ia64/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/sh/Kconfig
arch/x86/Kconfig
drivers/acpi/Kconfig
drivers/base/dd.c
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Kconfig.x86
drivers/gpio/Kconfig
drivers/gpu/drm/exynos/exynos_drm_g2d.c
drivers/gpu/drm/exynos/exynos_drm_rotator.c
drivers/gpu/drm/exynos/exynos_hdmi.c
drivers/misc/atmel-ssc.c
drivers/mtd/devices/Kconfig
drivers/net/ethernet/8390/Kconfig
drivers/net/ethernet/fujitsu/Kconfig
drivers/net/ethernet/i825xx/Kconfig
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/seeq/Kconfig
drivers/net/wan/Kconfig
drivers/pinctrl/pinctrl-exynos5440.c
drivers/pinctrl/pinctrl-falcon.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-xway.c
drivers/spi/Kconfig
drivers/spi/spi-ep93xx.c
drivers/spi/spi-mxs.c
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-sirf.c
drivers/spi/spi-tegra20-sflash.c
drivers/spi/spi-tegra20-slink.c
drivers/spi/spi.c
drivers/video/exynos/exynos_dp_core.c
include/linux/device.h
include/linux/power_supply.h
include/linux/printk.h
include/linux/rtc.h
init/Kconfig
lib/Kconfig.debug
net/Kconfig
net/mac80211/Kconfig
net/netfilter/Kconfig
net/nfc/core.c
sound/soc/fsl/imx-audmux.c
sound/soc/mxs/mxs-saif.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc arch/sh/Kconfig
Simple merge
Simple merge
index 78105b3a52623e9b22be90f71dcaa5b1ae33b725,7ec178e03379524c85bc914980c73f989c9f75a9..1a4ed64586a726bfd8ccc70ea6b7f8a9cde0651a
@@@ -337,8 -335,7 +335,7 @@@ config X86_PM_TIME
          systems require this timer. 
  
  config ACPI_CONTAINER
-       bool "Container and Module Devices (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
 -      tristate "Container and Module Devices"
++      bool "Container and Module Devices"
        default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
        help
          This driver supports ACPI Container and Module devices (IDs
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0c077b0f7a2bf43036b912222b350704b80e2c50,c0cd88dd6bb59527e7833a489dc6a0cbb433568a..13daec88d918ddd07ba7d317c2937db8cc87c63e
@@@ -356,9 -356,63 +356,9 @@@ config SDL
          To compile this driver as a module, choose M here: the
          module will be called sdla.
  
 -# Wan router core.
 -config WAN_ROUTER_DRIVERS
 -      tristate "WAN router drivers"
 -      depends on WAN_ROUTER
 -      ---help---
 -        Connect LAN to WAN via Linux box.
 -
 -        Select driver your card and remember to say Y to "Wan Router."
 -        You will need the wan-tools package which is available from
 -        <ftp://ftp.sangoma.com/>.
 -
 -        Note that the answer to this question won't directly affect the
 -        kernel except for how subordinate drivers may be built:
 -        saying N will just cause the configurator to skip all
 -        the questions about WAN router drivers.
 -
 -        If unsure, say N.
 -
 -config CYCLADES_SYNC
 -      tristate "Cyclom 2X(tm) cards"
 -      depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
 -      ---help---
 -        Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an
 -        intelligent multiprotocol WAN adapter with data transfer rates up to
 -        512 Kbps. These cards support the X.25 and SNA related protocols.
 -
 -        While no documentation is available at this time please grab the
 -        wanconfig tarball in
 -        <http://www.conectiva.com.br/~acme/cycsyn-devel/> (with minor changes
 -        to make it compile with the current wanrouter include files; efforts
 -        are being made to use the original package available at
 -        <ftp://ftp.sangoma.com/>).
 -
 -        Feel free to contact me or the cycsyn-devel mailing list at
 -        <acme@conectiva.com.br> and <cycsyn-devel@bazar.conectiva.com.br> for
 -        additional details, I hope to have documentation available as soon as
 -        possible. (Cyclades Brazil is writing the Documentation).
 -
 -        The next questions will ask you about the protocols you want the
 -        driver to support (for now only X.25 is supported).
 -
 -        If you have one or more of these cards, say Y to this option.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called cyclomx.
 -
 -config CYCLOMX_X25
 -      bool "Cyclom 2X X.25 support"
 -      depends on CYCLADES_SYNC
 -      help
 -        Connect a Cyclom 2X card to an X.25 network.
 -
 -        Enabling X.25 support will enlarge your kernel by about 11 kB.
 -
  # X.25 network drivers
  config LAPBETHER
-       tristate "LAPB over Ethernet driver (EXPERIMENTAL)"
+       tristate "LAPB over Ethernet driver"
        depends on LAPB && X25
        ---help---
          Driver for a pseudo device (typically called /dev/lapb0) which allows
Simple merge
Simple merge
index de9e8519b803570e4188bb58d5b0c77cf6ab004f,96e7cfbbce6da8793f0c5d56cab4907c3de56304..3c80dd98304bc6ce08a021b60d664cc9641b05c9
@@@ -1351,24 -1350,34 +1351,24 @@@ static int nmk_gpio_probe(struct platfo
        }
  
        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
 -      if (!res) {
 -              ret = -ENOENT;
 -              goto out;
 -      }
 +      if (!res)
 +              return -ENOENT;
  
        irq = platform_get_irq(dev, 0);
 -      if (irq < 0) {
 -              ret = irq;
 -              goto out;
 -      }
 +      if (irq < 0)
 +              return irq;
  
        secondary_irq = platform_get_irq(dev, 1);
 -      if (secondary_irq >= 0 && !pdata->get_secondary_status) {
 -              ret = -EINVAL;
 -              goto out;
 -      }
 +      if (secondary_irq >= 0 && !pdata->get_secondary_status)
 +              return -EINVAL;
  
-       base = devm_request_and_ioremap(&dev->dev, res);
-       if (!base)
-               return -ENOMEM;
+       base = devm_ioremap_resource(&dev->dev, res);
 -      if (IS_ERR(base)) {
 -              ret = PTR_ERR(base);
 -              goto out;
 -      }
++      if (IS_ERR(base))
++              return PTR_ERR(base);
  
        clk = devm_clk_get(&dev->dev, NULL);
 -      if (IS_ERR(clk)) {
 -              ret = PTR_ERR(clk);
 -              goto out;
 -      }
 +      if (IS_ERR(clk))
 +              return PTR_ERR(clk);
        clk_prepare(clk);
  
        nmk_chip = devm_kzalloc(&dev->dev, sizeof(*nmk_chip), GFP_KERNEL);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 7cfbe9d3381f7d00b08bc74017c38ae7c0fc6d67,3d4a7c48d74d9f0237d17bfb4dfa99c00a35169e..e862ab8853aa1f9ff242cdde3bf741dc2a257dd2
@@@ -1241,11 -1276,10 +1241,10 @@@ static int s3c64xx_spi_probe(struct pla
        /* the spi->mode bits understood by this driver: */
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
  
-       sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
-       if (sdd->regs == NULL) {
-               dev_err(&pdev->dev, "Unable to remap IO\n");
-               ret = -ENXIO;
+       sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(sdd->regs)) {
+               ret = PTR_ERR(sdd->regs);
 -              goto err1;
 +              goto err0;
        }
  
        if (!sci->cfg_gpio && pdev->dev.of_node) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
diff --cc net/Kconfig
Simple merge
Simple merge
index d4dd702574e4cafeccfa4272b4da4c23bbeacb09,456833d7aaeaa205c25e083471f626b69dcd372a..56d22cae590683c9a3b530ad0152b105d5c19c2d
@@@ -124,15 -124,8 +124,14 @@@ config NF_CONNTRACK_TIMESTAM
  
          If unsure, say `N'.
  
 +config NF_CONNTRACK_LABELS
 +      bool
 +      help
 +        This option enables support for assigning user-defined flag bits
 +        to connection tracking entries.  It selected by the connlabel match.
 +
  config NF_CT_PROTO_DCCP
-       tristate 'DCCP protocol connection tracking support (EXPERIMENTAL)'
-       depends on EXPERIMENTAL
+       tristate 'DCCP protocol connection tracking support'
        depends on NETFILTER_ADVANCED
        default IP_DCCP
        help
diff --cc net/nfc/core.c
Simple merge
Simple merge
Simple merge