##############################################################################
# File based on 2.6.30
##############################################################################

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

git-update.patch
git-update2.patch
git-update3.patch
git-update4.patch
git-update5.patch
git-update6.patch

# 2.6.31-rc1
git-update7.patch

##############################################################################
# Marker corresponding to base
##############################################################################
git-update8.patch
git-update9.patch
base

##############################################################################
# BASE v2.6.31-rc1-364-ge83c2b0
##############################################################################

##############################################################################
# Upstream in 2.6.31-rc1
##############################################################################

#dm-mpath-validate-table-argument-count.patch
#dm-mpath-validate-hw_handler-argument-count.patch
#dm-sysfs-skip-output-when-device-is-being-destroyed.patch

#dm-mpath-change-attached-scsi_dh.patch
#dm-mpath-call-activate-fn-for-each-path-in-pg_init.patch

#dm-raid1-keep-retrying-alloc-if-mempool_alloc-failed.patch

#dm-mpath-flush-keventd-queue-in-destructor.patch

#dm-avoid-unsupported-spanning-of-md-stripe-boundaries.patch
## dm-avoid-unsupported-spanning-of-md-stripe-boundaries-fixup-for-linux-next.patch

#dm-use-i_size_read.patch

#dm-exception-store-fix-exstore-lookup-to-be-case-insensitive.patch

# Barriers
#dm-rename-suspended_bdev-to-bdev.patch
#dm-always-hold-bdev-reference.patch
#dm-make-dm_flush-return-void.patch
#dm-process-requeue-in-dm_wq_work.patch
#dm-store-only-first-barrier-error.patch
#dm-remove-EOPNOTSUPP-for-barriers.patch
#dm-remove-check-that-prevents-mapping-empty-bios.patch
#dm-introduce-num_flush_requests.patch
#dm-initialise-tio-in-alloc_tio.patch
#dm-send-empty-barriers-to-targets-in-dm_flush.patch
#dm-linear-support-flush.patch
#dm-stripe-support-flush.patch
#dm-crypt-support-flush.patch
#dm-delay-support-barriers.patch
#dm-mpath-support-barriers.patch
#dm-snapshot-support-barriers.patch
#dm-io-record-eopnotsupp.patch
#dm-io-retry-after-barrier-error.patch
#dm-snapshot-use-barrier-when-writing-exception-store.patch

# dynamic load balancers
#dm-mpath-add-start_io-and-nr_bytes-to-path-selectors.patch
#dm-mpath-add-queue-length-load-balancer.patch
#dm-mpath-add-service-time-load-balancer.patch

#dm-table-improve-warning-message-when-devices-not-freed-before-destruction.patch
#dm-sysfs-add-suspended-attribute.patch

#dm-ioctl-support-cookies-for-udev.patch
## dm-ioctl-support-cookies-for-udev-old.patch

#dm-table-ensure-targets-are-aligned-to-logical_block_size.patch
#dm-table-validate-device-logical_block_size.patch

#dm-table-replace-struct-io_restrictions-with-struct-queue_limits.patch
## dm-table-replace-struct-io_restrictions-with-struct-queue_limits-old.patch
#dm-table-establish-queue-limits-by-copying-table-limits.patch

#dm-targets-introduce-iterate-devices-fn.patch

#dm-log-fix-create_log_context-to-use-logical_block_size-of-log-device.patch

#dm-calculate-queue-limits-during-resume-not-load.patch
## dm-calculate-queue-limits-during-resume-not-load-old.patch

#dm-raid1-add-userspace-log.patch
## dm-raid1-add-clustering.patch

# Request-based mpath (tentative)
#dm-prepare-for-request-based-option.patch
#dm-enable-request-based-option.patch
#dm-do-not-set-QUEUE_ORDERED_DRAIN-if-request-based.patch
#dm-disable-interrupt-when-taking-map_lock.patch
#dm-mpath-change-to-be-request-based.patch


# Bug fixes for 2.6.31-rc1 - 2 patches sent to Linus 2009/06/30
#dm-exception-store-really-fix-type-lookup.patch
## dm-exception-store-really-fix-lookup-error.patch

#dm-table-fix-blk_stack_limits-arg-to-use-bytes-not-sectors.patch

##############################################################################
# Imported from linux-next and edited by Mike Snitzer
##############################################################################

#block-Do-away-with-the-notion-of-hardsect_size.patch
#block-Use-accessor-functions-for-queue-limits.patch
#block-Move-queue-limits-to-an-embedded-struct.patch
#block-Expose-stacked-device-queues-in-sysfs.patch
#block-Export-I-O-topology-for-block-devices-and-partitions.patch
#block-export-blk-stack-limits.patch
#block-Fix-bounce-limit-setting-in-DM.patch
#block-Add-missing-bounce_pfn-stacking-and-fix-comme.patch
#block-introduce-blk_set_default_limits.patch

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

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

#dm-table-ensure-targets-are-aligned-to-hardsect_size.patch
#dm-table-validate-device-hardsect_size.patch

# Revert linux-next changes to fix compile until mkp's patches are located.
#dm-table-ensure-targets-are-aligned-to-hardsect_size-revert-name.patch
#dm-table-validate-device-hardsect_size-revert-name.patch

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

# Experimental


# 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

# dynamic load balancers
#dm-mpath-add-size-to-path-selector-interface.patch

# request-based mpath
#dm-add-request-based-facility.patch
#dm-permit-request-based-facility.patch
#dm-enforce-new-queue-limits.patch

# convert multipath target to request-based
#dm-mpath-change-to-be-request-based-old.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

# Something like this needed - and for other 'use' refs too.
# dm-log-use-module-refcount-directly.patch
# - superceded

# Clustered mirror
# dm-raid1-add-clustering-old.patch
# - superceded

# 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

# Needs extracting from earlier version lower down
dm-snapshot-hold-primary_pe-reference.patch


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

dm-raid1-read-balancing.patch

dm-userspace.patch

dm-mpath-default-to-scsi-err-handler.patch

# Needs solving a different way
dm-snapshot-chunksize-fix.patch

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

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

# Need re-working to take account of other changes made since.
dm-snapshot-fix-origin-writes.patch
dm-snapshot-tidy-snapshot_map-original.patch
dm-snapshot-add-workqueue-original.patch
dm-snapshot-track-snapshot-read-old.patch