Merge remote-tracking branch 'rcu/rcu/next'

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/iommu/Makefile

Merge remote-tracking branch 'gpio/gpio/next'

Merge remote-tracking branch 'spi/spi/next'

Merge remote-tracking branch 'devicetree/devicetree/next'

Merge remote-tracking branch 'edac-amd/for-next'

Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

Merge remote-tracking branch 'fsnotify/for-next'

Merge remote-tracking branch 'apm/for-next'

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/ide/Kconfig
drivers/net/Kconfig

Merge remote-tracking branch 'osd/linux-next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'dwmw2-iommu/master'

Merge remote-tracking branch 'watchdog/master'

Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

Merge remote-tracking branch 'drm/drm-next'

Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-u300/include/mach/irqs.h

Merge remote-tracking branch 'md/for-next'

Merge remote-tracking branch 'slab/for-next'

Merge remote-tracking branch 'kgdb/kgdb-next'

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c

Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

Merge remote-tracking branch 'battery/master'

Merge branch 'quilt/device-mapper'

Merge remote-tracking branch 'block/for-next'

Merge remote-tracking branch 'input/next'

Merge branch 'quilt/rr'

Merge remote-tracking branch 'cpufreq/next'

Merge remote-tracking branch 'sound-asoc/for-next'

Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

Merge remote-tracking branch 'wireless/master'

Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c

Merge remote-tracking branch 'slave-dma/next'

Merge remote-tracking branch 'scsi/master'

Merge remote-tracking branch 'ibft/master'

Merge remote-tracking branch 'swiotlb/master'

Merge remote-tracking branch 'ieee1394/for-next'

Merge remote-tracking branch 'infiniband/for-next'

Merge remote-tracking branch 'libata/NEXT'

Merge remote-tracking branch 'kconfig/for-next'

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'v4l-dvb/master'

Merge remote-tracking branch 'docs/docs-move'

Merge branch 'quilt/kernel-doc'

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Merge branch 'quilt/jdelvare-hwmon'

Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Merge branch 'quilt/i2c'

Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-wacom.c

Merge remote-tracking branch 'xfs/master'

Merge remote-tracking branch 'v9fs/for-next'

Merge remote-tracking branch 'ocfs2/linux-next'

Merge remote-tracking branch 'nfsd/nfsd-next'

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'cifs/master'

Merge remote-tracking branch 'ceph/for-next'

Merge remote-tracking branch 'xtensa/master'

Merge remote-tracking branch 'unicore32/unicore32'

Merge remote-tracking branch 'tile/master'

Merge remote-tracking branch 'rmobile/rmobile-latest'

Merge remote-tracking branch 'sh/sh-latest'

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

Merge remote-tracking branch 'powerpc/next'

Merge remote-tracking branch 'parisc/for-next'

Merge remote-tracking branch 'mips/mips-for-linux-next'

Merge remote-tracking branch 'm68knommu/for-next'

Merge remote-tracking branch 'm68k/for-next'

Merge remote-tracking branch 'ia64/next'

Merge branch 'quilt/hexagon'

Merge remote-tracking branch 'cris/for-next'

Merge remote-tracking branch 'c6x/for-linux-next'

Merge remote-tracking branch 'blackfin/for-linus'

Merge remote-tracking branch 'tegra/for-next'

Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/mm.c

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9g45.c

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'ide/master'

Merge remote-tracking branch 'pci-current/for-linus'

Merge remote-tracking branch 'sparc/master'

Merge remote-tracking branch 'm68k-current/for-linus'

Merge remote-tracking branch 'arm-current/fixes'

Initial EXPERIMENTAL implementation of device-mapper thin provisioning
with snapshot support.  The 'thin' target is used to create instances of
the virtual devices that are hosted in the 'thin-pool' target.  The
thin-pool target provides data sharing among devices.  This sharing is
made possible using the persistent-data library in the previous patch.

The main highlight of this implementation, compared to the previous
implementation of snapshots, is that it allows many virtual devices to
be stored on the same data volume, simplifying administration and
allowing sharing of data between volumes (thus reducing disk usage).

Another big feature is support for arbitrary depth of recursive
snapshots (snapshots of snapshots of snapshots ...).  The previous
implementation of snapshots did this by chaining together lookup tables,
and so performance was O(depth).  This new implementation uses a single
data structure so we don't get this degradation with depth.

For further information and examples of how to use this, please read
Documentation/device-mapper/thin-provisioning.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

The persistent-data library offers a re-usable framework for the storage
and management of on-disk metadata in device-mapper targets.

It's used by the thin-provisioning target in the next patch and in an
upcoming hierarchical storage target.

For further information, please read
Documentation/device-mapper/persistent-data.txt

Signed-off-by: Joe Thornber <thornber@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

cifs: clean up check_rfc1002_header

Rename it for better clarity as to what it does and have the caller pass
in just the single type byte. Turn the if statement into a switch and
optimize it by placing the most common message type at the top. Move the
header length check back into cifs_demultiplex_thread in preparation
for adding a new receive phase and normalize the cFYI messages.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next

virtio-pci: Use PCI MMIO instead of PIO when available

Currently virtio-pci is specced so that configuration of the device is
done through a PCI IO space (via BAR 0 of the virtual PCI device).
However, use of PCI IO space (aka PIO) is long deprecated, and can be
awkward to use on some systems (for example IBM pSeries machines
typically have many PCI domains, and not all firmware/hypervisor
versions necessarily support PCI PIO access on all domains).

Therefore, it would be preferable for the virtio virtual PCI device to
advertise a PCI memory space (aka MMIO) BAR and have configuration
done through this interface instead.  This can be done backwards
compatibly by advertising the MMIO BAR in addition to the existing PIO
BAR so that the guest driver can choose whichever interface.

In anticipation of adding such an MMIO BAR to virtio host-side
implementations (e.g. qemu), this patch updates the Linux virtio-pci
driver to attempt to use BAR 2 (which will be MMIO) in preference to
the existing PIO BAR 0.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>