##############################################################################
# File based on 2.6.31-rc1
##############################################################################

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

git-update7.patch
git-update8.patch
git-update9.patch
git-update10.patch
git-update11.patch
git-update12.patch
git-update13.patch
git-update14.patch
git-update15.patch
git-update16.patch
git-update17.patch
git-update18.patch
git-update19.patch
#git-update20.patch
git-update21.patch # v2.6.31
git-update22.patch # v2.6.31-1335-g86d7101
git-update23.patch # v2.6.31-7068-g43c1266
git-update24.patch # v2.6.32-rc1

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

base

##############################################################################
# BASE v2.6.32-rc1
##############################################################################

# 3 fixes sent to Linus 2009/07/23 for 2.6.31-rc5

#dm-raid1-wake-kmirrord-when-requeueing-delayed-bios-after-remote-recovery.patch
#dm-remove-queue-next_ordered-workaround-for-barriers.patch
#dm-table-pass-correct-dev-area-size-to-device_area_is_valid.patch

# 13 fixes sent to Linus 2009/09/04 for 2.6.31
#dm-multipath-fix-oops-when-request-based-io-fails-when-no-paths.patch

#dm-snapshot-implement-iterate-devices.patch
#dm-table-fix-queue_limit-checking-device-iterator.patch
#dm-table-add-more-context-to-terse-warning-messages.patch
##dm-table-add-more-context-to-two-terse-warning-messages.patch
##dm-table-fix-logical_block_size-in-printf-format-strings.patch

#dm-stripe-expose-correct-io-hints.patch

#dm-log-fix-userspace-status-output.patch
#dm-log-remove-incorrect-field-from-userspace-table-output.patch
##dm-log-reorder-userspace-ctr-args.patch
##dm-log-remove-incorrect-field-from-userspace-table-output-unfolded.patch
#dm-raid1-do-not-allow-log_failure-variable-to-unset-after-being-set.patch
#dm-log-userspace-add-luid-to-distinguish-between-concurrent-log-instances.patch

#dm-snapshot-refactor-zero_disk_area-to-use-chunk_io.patch
#dm-snapshot-fix-header-corruption-race-on-invalidation.patch
#dm-exception-store-split-set_chunk_size.patch
#dm-snapshot-fix-on-disk-chunk-size-validation.patch

##############################################################################
# This section of patches gets imported into linux-next after the block tree.
#
# NEXT_BASE block 
# NEXT_PATCHES_START
##############################################################################

dm-log-fix-cn_ulog_callback-declaration.patch
dm-log-userspace-fix-incorrect-luid-cast-in-userspace_ctr.patch
dm-snapshot-free-exception-store-on-init-failure.patch
dm-add-missing-del_gendisk-to-alloc_dev-error-path.patch
dm-dec_pending-needs-locking-to-save-error-value.patch
dm-snapshot-require-non-zero-chunk-size-by-end-of-ctr.patch

dm-ioctl-prefer-strlcpy-over-strncpy.patch
dm-snapshot-avoid-else-clause-in-persistent_read_metadata.patch
dm-snapshot-allow-chunk-size-to-be-less-than-page-size.patch
dm-snapshot-simplify-sector_to_chunk-expression.patch
dm-snapshot-abstract-minimum_chunk_size-fn.patch

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

dm-snapshot-cleanup-style.patch


# Experimental
dm-emulate-BLKRRPART-ioctl.patch

# Full raid1 barrier support
dm-io-handle-empty-barriers.patch
dm-raid1-support-flush.patch
3-8-raid1-barriers.patch
4-8-raid1-barriers.patch
5-8-raid1-barriers.patch
6-8-raid1-barriers.patch
7-8-raid1-barriers.patch
8-8-raid1-barriers.patch

dm-region_hash-change-primes.patch

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

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

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

mm

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

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

dm-add-ioband.patch

# raid45 - no longer compiles
dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch
dm-raid45-to-be-split.patch

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

# 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

# Needs more thought: Should any of these be per-device not per-target?
dm-use-singlethread-workqueues.patch

# Bio split patches for 2.6.22 regressions - further changes still necessary.
dm-change-clone-bi_private-pointer-during-cleanup.patch
dm-split-bios-into-only-two-pieces.patch
dm-remove-struct-clone_info.patch
dm-tidy-io-initialisation-functions.patch
dm-handle-clone-reprocessing.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-extract-region_hash.patch
dm-iostats.patch
dm-throttle.patch

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

# Won't be submitted - different solution being worked on in scsi
bio-sense-data.patch
dm-mpath-hw-handler-sense-data.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

# For testing: tidy, enhance & submit upstream
dm-flakey.patch