##############################################################################
# File based on v3.9-rc1
##############################################################################

##############################################################################
# Upstream changes since release
##############################################################################

git-update1.patch # v3.9-rc2
git-update2.patch # v3.9-rc3
git-update3.patch # v3.9-rc4
git-update4.patch # v3.9-rc5
git-update5.patch # v3.9-rc6
git-update6.patch # v3.9-rc8
git-update7.patch # v3.9

git-update8.patch # v3.9-10936-g51a26ae
git-update9.patch # v3.9-11789-ge0fd9af
git-update10.patch # v3.9-12316-g70eba42
git-update11.patch # v3.10-rc1
git-update12.patch # v3.10-rc7
git-update13.patch # v3.10-rc7-8-gacdb37c
git-update14.patch # v3.10
git-update15.patch # v3.10-8587-g496322b
git-update16.patch # v3.10-8918-g8133633
git-update17.patch # v3.10-8982-g6d128e1
git-update18.patch # v3.10-9289-g9903883
git-update19.patch # v3.11-rc1

##############################################################################
# Base against linux-next this cycle
##############################################################################

##############################################################################
# Marker corresponding to base
##############################################################################

base

##############################################################################
# References used to be to http://patchwork.kernel.org/patch/<number>/ but
# currently refer to a private patchwork instance.
# N.B. Patches and headers may have been modified since submission.
##############################################################################

##############################################################################
# Patches already in linux-next from other sources
##############################################################################

##############################################################################
# 'git describe --match v\*'
# BASE v3.11-rc1
##############################################################################

##############################################################################
# This section of patches gets imported into linux-next after the block tree.
#### NEXT*BASE block  - uncomment and replace * with _ to base on block
# NEXT_PATCHES_START
##############################################################################

## 10 patches sent to Linus 2013/03/21
#dm-thin-fix-discard-corruption.patch
#dm-thin-fix-non-power-of-two-discard-granularity-calc.patch
#dm-verity-avoid-deadlock.patch
#dm-cache-avoid-64-bit-division-on-32-bit.patch
#dm-cache-detect-cache_create-failure.patch
#dm-cache-avoid-calling-policy-destructor-twice-on-error.patch
#dm-cache-metadata-clear-dirty-bits-on-clean-shutdown.patch
#dm-cache-fix-race-in-writethrough-implementation.patch
#dm-cache-policy-change-version-from-string-to-integer-set.patch
#dm-cache-policy-ignore-hints-if-generated-by-different-version.patch

## 2 patches sent to Linux for 3.9-rc6 2013/04/06
#dm-cache-fix-writes-to-cache-device-in-writethrough-mode.patch
#dm-cache-reduce-bio-front_pad-size-in-writeback-mode.patch

## 21 patches sent to Linus for 3.10-rc1 2013/05/10
#dm-stripe-fix-regression-in-stripe_width-calculation.patch
#dm-cache-fix-error-return-code-in-cache_create.patch
#dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch
#dm-bufio-avoid-a-possible-__vmalloc-deadlock.patch
#dm-table-fix-write-same-support.patch
#dm-mpath-enable-WRITE-SAME-support.patch
#dm-cache-tune-migration-throttling.patch
#dm-persistent-data-fix-error-message-typos.patch
#dm-document-iterate_devices.patch
#dm-cache-policy-fix-description-of-lookup-fn.patch
#dm-cache-fix-typos-in-comments.patch
#dm-cache-replace-memcpy-with-struct-assignment.patch
#dm-thin-refactor-data-dev-resize.patch
#dm-thin-open-dev-read-only-when-possible.patch
#dm-persistent-data-support-space-map-resizing.patch
#dm-thin-detect-metadata-device-resizing.patch
#dm-persistent-data-add-threshold-callback-to-space-map.patch
#dm-persistent-metadata-add-space-map-threshold-callback.patch
#dm-thin-generate-event-when-metadata-threshold-passed.patch
#dm-cache-move-config-fns.patch
#dm-cache-set-config-value.patch

## Essential fix for -rc1 breakage. Sent upstream
#dm-thin-fix-metadata-dev-resize-detection.patch

## 13 patches sent to Linus for 3.11  2013/07/11
#dm-mpath-fix-ioctl-deadlock-when-no-paths.patch
#dm-ioctl-set-noio-flag-to-avoid-__vmalloc-deadlock.patch
#dm-verity-fix-inability-to-use-a-few-specific-devices-sizes.patch
#dm-use-__GFP_HIGHMEM-in-__vmalloc.patch
#dm-verity-remove-pointless-comparison.patch
#dm-flakey-correct-ctr-alloc-failure-mesg.patch
#dm-verity-use-__ffs-and-__fls.patch
#dm-cache-fix-arm-link-errors-with-inline.patch
##dm-raid-suppress-uninitialized-variable-warning.patch
#dm-bufio-submit-writes-outside-lock.patch
#dm-optimize-use-SRCU-and-RCU.patch
#dm-optimize-reorder-structure.patch # 47284
#dm-update-maintainers.patch
#dm-add-switch-target.patch
##dm-add-switch-target-old.patch # 53568

##############################################################################
# NEXT_PATCHES_END
##############################################################################

##############################################################################
# Marker corresponding to end of -next tree.
##############################################################################

next

##############################################################################
# Patches already included in -mm from other sources
##############################################################################

##############################################################################
# This section of patches gets imported into -mm.
# (linux-next patches above get pulled in separately now.)
#
# MM_PATCHES_START
##############################################################################

##############################################################################
# MM_PATCHES_END
##############################################################################

##############################################################################
# Patches from other sources included in -mm below the dm section
##############################################################################

##############################################################################
# Marker corresponding to end of -mm tree.
##############################################################################

mm

##############################################################################
# May need more work or testing, but close to being ready.
##############################################################################

# Needs some more thought
dm-verity-emit-uevents-on-errors.patch

# For 3.12
dm-add-statistics.patch # 57153

dm-persistent-data-reorder-fns.patch

# For 3.12 or later
dm-add-zeroed-target.patch # 56603

# For 3.12 or later but need more work & testing first
dm-cache-mq-perform-writeback-in-background.patch
dm-cache-mq-promote-writes-to-discarded-blocks.patch

#dm-thin-support-metadata-resizing.patch

# dm-thin-improve-metadata-threshold-calculation.patch

# Probably needs doing a different way
dm-mpath-disallow-change-of-scsi-device-handler-to-avoid-race.patch


# Needs proper testing
#dm-use-new-hashtable-implementation.patch # 55934


##############################################################################
# End of patches that apply cleanly and are under active review.
##############################################################################

end


dm-track-writeable-opens.patch

dm-cache-add-basic-policy.patch
dm-cache-add-debug-policy.patch


###
dm-mpath-add-ability-to-disable-partition-creation.patch # 47029

dm-update-max_io_len-to-support-a-split_io-that-is-not-a-power-of-2.patch # 46699

dm-thin-commit-metadata-before-providing-status.patch # 45899

dm-table-export-singleton-target.patch

# Depends on agreement for exported symbol
dm-table-extend-device-name-lookups.patch # 101025

# older patches

dm-table-limit-max_segments-when-no-merge_bvec-fn.patch # 83666

dm-mpath-refactor-pg_init-trigger.patch # 76028

dm-raid1-clear-region_hash-on-suspend.patch # 62948


# replicator
v6-1-4-dm-replicator-documentation-and-module-registry.patch
v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch
v6-3-4-dm-replicator-ringbuffer-replication-log-handler.patch
v6-4-4-dm-replicator-blockdev-site-link-handler.patch

# multisnap
dm-multisnap-common.patch

dm-multisnap-mikulas-headers.patch
dm-multisnap-mikulas-alloc.patch
dm-multisnap-mikulas-blocks.patch
dm-multisnap-mikulas-btree.patch
dm-multisnap-mikulas-commit.patch
dm-multisnap-mikulas-delete.patch
dm-multisnap-mikulas-freelist.patch
dm-multisnap-mikulas-io.patch
dm-multisnap-mikulas-snaps.patch
dm-multisnap-mikulas-common.patch
dm-multisnap-mikulas-config.patch

dm-multisnap-daniel.patch


dm-snapshot-cleanup-style.patch

# Experimental

dm-region_hash-change-primes.patch

# An attempt to get UML to work with dm.
uml-fixes.patch

dm-add-ioband.patch

dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch

# Don't think we want the next one
dm-raid1-increase-dm-io-pages.patch

# Will be needed by new replicator module
dm-export-dm_disk.patch

# An alternative to loop 
dm-loop.patch

dm-delay-unplug-queue.patch

# Needs more review 
dm-mpath-add-alua.patch

dm-tidy-io-initialisation-functions.patch

##############################################################################
# Under review - only try the remaining patches if you know what you're doing!
# Some don't even compile.
##############################################################################

# Need integrating and cleaning up
dm-memcache.patch
dm-iostats.patch
dm-throttle.patch

# Doesn't fix this properly yet
dm-snapshot-invalidate-from-workqueue.patch

# Unfinished
dm-kcopyd-add-async-destruction-option.patch
dm-snapshot-release-memory-if-invalid.patch

# Awaiting a thorough review
dm-mpath-pg_timeout.patch

dm-raid1-mempool-bug-workaround-reversion.patch

dm-raid1-read-balancing.patch

dm-userspace.patch

# Needs further tidying.  Add rate-limiting to messages?
dm-mpath-improve-err-mesgs.patch