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

##############################################################################
# Upstream changes since release
##############################################################################
git-update1.patch # v3.6-rc4
git-update2.patch # v3.6-rc5
git-update3.patch # v3.6-rc7
git-update4.patch # v3.6-rc7-g6f0f9b6
git-update5.patch # v3.6-rc7-103-g6672d90
git-update6.patch # v3.6
git-update7.patch # v3.6-10003-gce40be7
git-update8.patch # v3.6-10596-g4f1cd91
git-update9.patch # v3.7-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
##############################################################################

# Via Jens for-next
#0001-block-Generalized-bio-pool-freeing.patch 
#0002-block-Ues-bi_pool-for-bio_integrity_alloc.patch 
#0003-dm-Use-bioset-s-front_pad-for-dm_rq_clone_bio_info.patch 
#0004-block-Add-bio_reset.patch 
#0005-pktcdvd-Switch-to-bio_kmalloc.patch 
#0006-block-Kill-bi_destructor.patch 
#0007-block-Consolidate-bio_alloc_bioset-bio_kmalloc.patch 
#0008-block-Add-bio_clone_bioset-bio_clone_kmalloc.patch 

##############################################################################
# 'git describe --match v\*'
# BASE v3.6-10596-g4f1cd91
##############################################################################

##############################################################################
# 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
##############################################################################

## 8 Fixes for 3.6 sent to Linus 2012/09/27
## KEEP THEM HERE UNTIL THEY REACH block
#dm-thin-do-not-set-discard_zeroes_data.patch
#dm-mpath-only-retry-ioctl-when-no-paths-if-queue_if_no_path-set.patch # 50958
#dm-handle-requests-beyond-end-of-device-instead-of-using-BUG_ON.patch # 52631
#dm-table-clear-add_random-unless-all-devices-have-it-set.patch # 50279
#dm-retain-table-limits-when-swapping-to-new-table-with-no-devices.patch # 52351
#dm-thin-tidy-discard-support.patch
#dm-thin-fix-discard-support-for-data-devices.patch # 50524
#dm-verity-fix-overflow-check.patch # 49489

## 8 patches sent to Linus for 3.7-rc1 2012/10/12
## Fixes - for 3.7
#dm-mpath-fix-check-for-null-mpio-in-end_io-fn.patch # 50570
## Cleanup
#dm-bufio-use-list_move.patch # 50696
#dm-use-ACCESS_ONCE-for-sysfs-values.patch # 51138
#dm-persistent-data-convert-to-use-le32_add_cpu.patch # 53733
## Enhancements
#dm-thin-support-discard-with-non-power-of-two-block-size.patch
#dm-thin-prepare-to-separate-bio_prison-code.patch # 53571
#dm-thin-move-bio_prison-code-to-separate-module.patch #53571
## Enhancements - depends on Jens' tree
#dm-store-dm_target_io-in-bio-front_pad.patch # 50967

##############################################################################
# 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.
##############################################################################


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

end


#0001-dm-gracefully-fail-any-request-that-accessess-beyond.patch # 51460

# dm-table-reduce-default-limit.patch # 51092

#dm-bio-prison-factor-bio-prison-code-out-to-standalone-library.patch
#dm-thin-remove-old-bio-prison-code-that-now-lives-in-dm-bio-prison.c.patch
#dm-bio-prison-add-dm_-prefix-to-bio-prison-and-deferred-set-interfaces.patch

dm-kcopyd-add-WRITE-SAME-support-to-dm_kcopyd_zero.patch # 45682

# Aiming for 3.8 - needs a bit more cleanup first
dm-add-switch-target.patch # 53568

dm-optimize-use-SRCU-and-RCU.patch # 47283
dm-optimize-reorder-structure.patch # 47284

#dm-add-switch-target.patch

# dm-add-div-wrappers.patch

# dm patch depends on scsi patch - sort out submission
#scsi_dh-add-scsi_dh_attached_handler_name.patch # 47083

#dm-mpath-add-default_hw_handler-feature.patch # 47082

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-add-zeroed-target.patch
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