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

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

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

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

Conflicts:
drivers/gpio/gpio-mxc.c

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

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

Conflicts:
drivers/remoteproc/remoteproc_core.c

Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

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

Conflicts:
drivers/net/tun.c

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

Conflicts:
fs/sync.c

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

Merge remote-tracking branch 'char-misc/char-misc-next'

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

Conflicts:
drivers/staging/comedi/drivers/s626.h
drivers/staging/gdm72xx/netlink_k.c

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

Conflicts:
include/scsi/scsi_device.h

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

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

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

Merge remote-tracking branch 'drivers-x86/linux-next'

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

Merge remote-tracking branch 'xen-two/linux-next'

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/kvm/booke_interrupts.S

Merge remote-tracking branch 'kmemleak/kmemleak'

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

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

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

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

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

Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c

Merge remote-tracking branch 'edac/linux_next'

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

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

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

Merge remote-tracking branch 'vfio/next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'watchdog/master'

Merge remote-tracking branch 'selinux/master'

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

Conflicts:
drivers/video/omap2/dss/core.c
drivers/video/omap2/dss/dispc.c

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

Merge remote-tracking branch 'battery/master'

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

Conflicts:
arch/arm/configs/tegra_defconfig
drivers/mfd/mc13xxx-spi.c
drivers/regulator/s5m8767.c
include/linux/mfd/s5m87xx/s5m-core.h

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

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

Merge branch 'quilt/device-mapper'

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

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

Merge remote-tracking branch 'input/next'

Merge branch 'quilt/rr'

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

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

Conflicts:
include/linux/pci_regs.h

Merge remote-tracking branch 'crypto/master'

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

Conflicts:
arch/arm/mach-imx/clk-imx6q.c

Merge remote-tracking branch 'mtd/master'

Merge remote-tracking branch 'bluetooth/master'

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

Conflicts:
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/mmc/host/sh_mmcif.c

Merge remote-tracking branch 'isci/all'

Merge remote-tracking branch 'target-merge/for-next-merge'

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

Conflicts:
drivers/ata/libata-core.c
include/scsi/scsi_device.h

Merge remote-tracking branch 'dlm/next'

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

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

Conflicts:
drivers/cpuidle/coupled.c

Merge remote-tracking branch 'acpi/next'

Conflicts:
drivers/pci/pci-acpi.c

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'

Conflicts:
Documentation/feature-removal-schedule.txt

Merge branch 'quilt/jdelvare-hwmon'

Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
drivers/i2c/busses/i2c-nomadik.c

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

Conflicts:
drivers/i2c/busses/i2c-omap.c

Merge branch 'quilt/i2c'

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

Merge remote-tracking branch 'pci/next'

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

Conflicts:
fs/xfs/xfs_buf.c
fs/xfs/xfs_log.c
fs/xfs/xfs_log_priv.h

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

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

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'gfs2/master'

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

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'ecryptfs/next'

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

Merge remote-tracking branch 'ceph/master'

Conflicts:
net/ceph/messenger.c
net/ceph/osd_client.c

Merge remote-tracking branch 'unicore32/unicore32'

Merge remote-tracking branch 'galak/next'

Merge remote-tracking branch 'mpc5xxx/next'

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

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

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

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

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

Merge remote-tracking branch 'gpio-current/gpio/merge'

Merge remote-tracking branch 'spi-current/spi/merge'

Merge remote-tracking branch 'devicetree-current/devicetree/merge'

Merge remote-tracking branch 'sparc/master'

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

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

Add read-only and fail-io modes to thin provisioning.

If a transaction commit fails the pool's metadata device will transition
to "read-only" mode.  If a commit fails once already in read-only mode
the transition to "fail-io" mode occurs.

Once in fail-io mode the pool and all associated thin devices will
report a status of "Fail".

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

Introduce dm_pool_abort_metadata to abort the current metadata
transaction.  Generally this will only be called when bad things are
happening and dm-thin is trying to roll back to a good state for
read-only mode.

It's complicated by the fact that the metadata device may have failed
completely causing the abort to be unable to read the old transaction.
In this case the metadata object is placed in a 'fail' mode and
everything fails apart from destroying it.

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

Introduce dm_pool_metadata_set_read_only to put the underlying block
manager into read-only mode.

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

Introduce dm_bm_set_read_only to switch the block manager into a
read-only mode.  To be used when dm-thin degrades due to io errors on
the metadata device.

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

Reduce the number of metadata commits by using
dm_thin_changed_this_transaction to check if metadata was changed on a
per thin device granularity.

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