Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
	drivers/acpi/Kconfig
	drivers/dma/dw_dmac.c
	drivers/i2c/busses/i2c-s3c2410.c
	drivers/iommu/tegra-smmu.c
	drivers/net/ethernet/8390/Kconfig
	drivers/net/ethernet/fujitsu/Kconfig
	drivers/net/ethernet/i825xx/Kconfig
	drivers/net/ethernet/intel/Kconfig
	drivers/net/ethernet/racal/Kconfig
	drivers/net/ethernet/seeq/Kconfig
	drivers/net/wan/Kconfig
	drivers/net/wireless/rtlwifi/Kconfig
	drivers/spi/Kconfig
	drivers/spi/spi-s3c64xx.c
	drivers/vhost/Kconfig
	drivers/vhost/Kconfig.tcm
	net/wanrouter/Kconfig

diff --cc Documentation/DocBook/kernel-hacking.tmpl
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
index c048dfd940f6d5778ffd79e737cb5fe91639810e,e96cf7a06d9f5afd3614449e66d820260af26e6a..eef7ca82fd3c9f3bac35fb0374cb99d8610b6c3d
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -384,9 -384,18 +384,8 @@@ config NXP_STB22
        help
         Support for NXP Semiconductors STB225 Development Board.
  
 -config PNX8550_JBS
 -      bool "NXP PNX8550 based JBS board"
 -      select PNX8550
 -      select SYS_SUPPORTS_LITTLE_ENDIAN
 -
 -config PNX8550_STB810
 -      bool "NXP PNX8550 based STB810 board"
 -      select PNX8550
 -      select SYS_SUPPORTS_LITTLE_ENDIAN
 -
  config PMC_MSP
        bool "PMC-Sierra MSP chipsets"
-       depends on EXPERIMENTAL
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/acpi/Kconfig
index 940b24af8ab18cf333a81172281485f3ec581549,7ec178e03379524c85bc914980c73f989c9f75a9..320006019e68bfc8fe3f26d63a80b9cf0a9a1f3d
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -334,8 -335,7 +332,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

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/cpufreq/Kconfig.x86
Simple merge

diff --cc drivers/dma/dw_dmac.c
index fe20f04be6a18ff78e310ce49feddd366648cbab,b33d1f6e13332400beab684bee3a092776531854..51c3ea2ed41af67e26dc09169fb51fbcc6117ac4
--- 1/drivers/dma/dw_dmac.c
--- 2/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/delay.h>
  #include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
 +#include <linux/dmapool.h>
+ #include <linux/err.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/io.h>
@@@ -1657,16 -1490,10 +1658,16 @@@ static int dw_probe(struct platform_dev
        if (irq < 0)
                return irq;
  
-       regs = devm_request_and_ioremap(&pdev->dev, io);
-       if (!regs)
-               return -EBUSY;
+       regs = devm_ioremap_resource(&pdev->dev, io);
+       if (IS_ERR(regs))
+               return PTR_ERR(regs);
  
 +      /* Apply default dma_mask if needed */
 +      if (!pdev->dev.dma_mask) {
 +              pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
 +              pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 +      }
 +
        dw_params = dma_read_byaddr(regs, DW_PARAMS);
        autocfg = dw_params >> DW_PARAMS_EN & 0x1;
  

diff --cc drivers/dma/mmp_pdma.c
Simple merge

diff --cc drivers/dma/tegra20-apb-dma.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_g2d.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_rotator.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_hdmi.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-at91.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
index 5e33df7c6c8258d03fd5299b8dfaeefe4438b149,c807a6d14f0ccc69e21105f74461963a1bbcb3cf..f6b880ba1932e9058a55ef8eca542629d0ea4ffd
--- 1/drivers/i2c/busses/i2c-s3c2410.c
--- 2/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -1038,15 -1038,16 +1038,13 @@@ static int s3c24xx_i2c_probe(struct pla
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res == NULL) {
                dev_err(&pdev->dev, "cannot find IO resource\n");
 -              ret = -ENOENT;
 -              goto err_clk;
 +              return -ENOENT;
        }
  
-       i2c->regs = devm_request_and_ioremap(&pdev->dev, res);
+       i2c->regs = devm_ioremap_resource(&pdev->dev, res);
  
-       if (i2c->regs == NULL) {
-               dev_err(&pdev->dev, "cannot request and map IO\n");
-               return -ENXIO;
 -      if (IS_ERR(i2c->regs)) {
 -              ret = PTR_ERR(i2c->regs);
 -              goto err_clk;
--      }
++      if (IS_ERR(i2c->regs))
++              return PTR_ERR(i2c->regs);
  
        dev_dbg(&pdev->dev, "registers %p (%p)\n",
                i2c->regs, res);

diff --cc drivers/i2c/busses/i2c-tegra.c
Simple merge

diff --cc drivers/ide/Kconfig
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/tegra-smmu.c
index 8b1d9f758076395f65fc4e1a5662b417594dda86,f08dbcd2f17585875e863a7ec24c032d8ee40413..eb0109f98946d6ab2c6267e408a836e0bc9bc3ee
--- 1/drivers/iommu/tegra-smmu.c
--- 2/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@@ -1185,13 -1177,10 +1186,13 @@@ static int tegra_smmu_probe(struct plat
                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
                if (!res)
                        return -ENODEV;
-               smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-               if (!smmu->regs[i])
-                       return -EBUSY;
+               smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(smmu->regs[i]))
+                       return PTR_ERR(smmu->regs[i]);
 +              smmu->rege[i] = smmu->regs[i] + resource_size(res) - 1;
        }
 +      /* Same as "mc" 1st regiter block start address */
 +      smmu->regbase = (void __iomem *)((u32)smmu->regs[0] & PAGE_MASK);
  
        err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);
        if (err)

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/media/Kconfig
Simple merge

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/usb/dvb-usb-v2/Kconfig
Simple merge

diff --cc drivers/misc/atmel-ssc.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/mmc/host/mxs-mmc.c
Simple merge

diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/devices/Kconfig
Simple merge

diff --cc drivers/mtd/nand/fsmc_nand.c
Simple merge

diff --cc drivers/mtd/nand/mxc_nand.c
Simple merge

diff --cc drivers/net/ethernet/8390/Kconfig
Simple merge

diff --cc drivers/net/ethernet/fujitsu/Kconfig
Simple merge

diff --cc drivers/net/ethernet/i825xx/Kconfig
Simple merge

diff --cc drivers/net/ethernet/intel/Kconfig
Simple merge

diff --cc drivers/net/ethernet/seeq/Kconfig
Simple merge

diff --cc drivers/net/wan/Kconfig
index 0c077b0f7a2bf43036b912222b350704b80e2c50,c0cd88dd6bb59527e7833a489dc6a0cbb433568a..13daec88d918ddd07ba7d317c2937db8cc87c63e
--- 1/drivers/net/wan/Kconfig
--- 2/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@@ -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

diff --cc drivers/pinctrl/pinctrl-exynos5440.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge

diff --cc drivers/platform/x86/Kconfig
index 12b8594f53420cacd22e33bbb1dd5cc889b20f1c,7ab0b2fba5031497a359e2e533a7214017aa0f35..585db6fa64b810df75befe4975a37f776389ad1b
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -79,22 -79,10 +79,21 @@@ config ASUS_LAPTO
  
          If you have an ACPI-compatible ASUS laptop, say Y or M here.
  
 +config CHROMEOS_LAPTOP
 +      tristate "Chrome OS Laptop"
 +      depends on I2C
 +      depends on DMI
 +      ---help---
 +        This driver instantiates i2c and smbus devices such as
 +        light sensors and touchpads.
 +
 +        If you have a supported Chromebook, choose Y or M here.
 +        The module will be called chromeos_laptop.
 +
  config DELL_LAPTOP
-       tristate "Dell Laptop Extras (EXPERIMENTAL)"
+       tristate "Dell Laptop Extras"
        depends on X86
        depends on DCDBAS
-       depends on EXPERIMENTAL
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL || RFKILL = n
        depends on SERIO_I8042

diff --cc drivers/remoteproc/Kconfig
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/scsi_transport_iscsi.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-ep93xx.c
Simple merge

diff --cc drivers/spi/spi-mxs.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc drivers/spi/spi-s3c64xx.c
index 7cfbe9d3381f7d00b08bc74017c38ae7c0fc6d67,3d4a7c48d74d9f0237d17bfb4dfa99c00a35169e..e862ab8853aa1f9ff242cdde3bf741dc2a257dd2
--- 1/drivers/spi/spi-s3c64xx.c
--- 2/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -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) {

diff --cc drivers/spi/spi-sirf.c
Simple merge

diff --cc drivers/spi/spi-tegra20-sflash.c
Simple merge

diff --cc drivers/spi/spi-tegra20-slink.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc drivers/thermal/exynos_thermal.c
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/vhost/Kconfig
index 613b074c3a5dde5cbdd0f53072ea090026c2f27c,bf243177ffe1857df97048ce1f67b1fb385d7f5e..85b773a93a5d1ec4e568ef0db77bd064838f9938
--- 1/drivers/vhost/Kconfig
--- 2/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  config VHOST_NET
-       tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
-       depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) && EXPERIMENTAL
+       tristate "Host kernel accelerator for virtio net"
+       depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)
 +      select VHOST_RING
        ---help---
          This kernel module can be loaded in host kernel to accelerate
          guest networking with virtio_net. Not to be confused with virtio_net

diff --cc drivers/vhost/Kconfig.tcm
index 0218f77a3464f4a2b8e4702afc36854521e6d014,7e3aa28d999e06a3410ab9f86cc23117ea91f819..c3a8cfa1de725ad29123a5e8dfcb3363b88ba37a
--- 1/drivers/vhost/Kconfig.tcm
--- 2/drivers/vhost/Kconfig.tcm
+++ b/drivers/vhost/Kconfig.tcm
@@@ -1,7 -1,6 +1,7 @@@
  config TCM_VHOST
-       tristate "TCM_VHOST fabric module (EXPERIMENTAL)"
-       depends on TARGET_CORE && EVENTFD && EXPERIMENTAL && m
+       tristate "TCM_VHOST fabric module"
+       depends on TARGET_CORE && EVENTFD && m
 +      select VHOST_RING
        default n
        ---help---
        Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/exynos/exynos_dp_core.c
Simple merge

diff --cc drivers/watchdog/at91sam9_wdt.c
Simple merge

diff --cc drivers/watchdog/pnx4008_wdt.c
index bbc249a3aa353e29df8e4e7e7317147723d5566b,de1f3fa1d78771341242a65a386089a13f72bc7a..a3684a30eb69d215f9631da775281c76a23b981a
--- 1/drivers/watchdog/pnx4008_wdt.c
--- 2/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@@ -152,12 -151,13 +152,12 @@@ static int pnx4008_wdt_probe(struct pla
        struct resource *r;
        int ret = 0;
  
 -      if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
 -              heartbeat = DEFAULT_HEARTBEAT;
 +      watchdog_init_timeout(&pnx4008_wdd, heartbeat, &pdev->dev);
  
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       wdt_base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!wdt_base)
-               return -EADDRINUSE;
+       wdt_base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(wdt_base))
+               return PTR_ERR(wdt_base);
  
        wdt_clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(wdt_clk))

diff --cc include/linux/power_supply.h
Simple merge

diff --cc include/linux/printk.h
Simple merge

diff --cc include/linux/rtc.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/Kconfig
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc net/netfilter/Kconfig
index d4dd702574e4cafeccfa4272b4da4c23bbeacb09,456833d7aaeaa205c25e083471f626b69dcd372a..56d22cae590683c9a3b530ad0152b105d5c19c2d
--- 1/net/netfilter/Kconfig
--- 2/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@@ -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

diff --cc sound/soc/fsl/imx-audmux.c
Simple merge

diff --cc sound/soc/mxs/mxs-saif.c
Simple merge