##############################################################################
# File based on 2.6.32-rc1
##############################################################################

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

git-update1.patch # v2.6.32-rc1-196-g0efe5e3
git-update2.patch # v2.6.32-rc3
git-update3.patch # v2.6.32-rc3-256-g36a0790
git-update4.patch # v2.6.32-rc4-149-ga3ccf63
git-update5.patch # v2.6.32-rc5
git-update6.patch # v2.6.32-rc5-81-g964fe08
git-update7.patch # v2.6.32-rc6-10-g51bb296
git-update8.patch # v2.6.32-rc6-346-gaa021ba

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

base

##############################################################################
# References are to http://patchwork.kernel.org/patch/<number>/
# N.B. Patches and headers may have been modified since submission.
##############################################################################

##############################################################################
# BASE v2.6.32-rc6-346-gaa021ba
##############################################################################

# Sent to Linus 2009/10/16 for 2.6.32-rc6
## dm-log-fix-cn_ulog_callback-declaration.patch - Included via davem.
#dm-snapshot-sort-by-chunk-size-to-fix-race.patch # 52876
#dm-snapshot-free-exception-store-on-init-failure.patch # 49433
#dm-log-userspace-fix-incorrect-luid-cast-in-userspace_ctr.patch # 48609
#dm-add-missing-del_gendisk-to-alloc_dev-error-path.patch #49524
#dm-dec_pending-needs-locking-to-save-error-value.patch # 48191
#dm-snapshot-require-non-zero-chunk-size-by-end-of-ctr.patch # 49548
#dm-exception-store-fix-failed-set_chunk_size-error-path.patch # 52095
#dm-snapshot-lock-snapshot-while-supplying-status.patch # 52638
#dm-snapshot-use-unsigned-integer-chunk-size.patch # 50706
#dm-snapshot-allow-chunk-size-to-be-less-than-page-size.patch # 49549

##############################################################################
# This section of patches gets imported into linux-next after the block tree.
# - Temporarily disabled: NEXT*BASE block 
# NEXT_PATCHES_START
##############################################################################

# Fixes
dm-avoid-_hash_lock-deadlock.patch # 58963
dm-exception-store-free-tmp_store-on-persistent-flag-error.patch # 38657
dm-sysfs-add-empty-release-function-to-avoid-debug-warning.patch # 54942

dm-io-use-slab-for-struct-io.patch # 59231
dm-io-remove-extra-bi_io_vec-region-hack.patch # 59233

# For 2.6.33-rc1
dm-raid1-add-framework-to-hold-bios-during-suspend.patch # 60997
dm-raid1-use-hold-framework-in-do_failures.patch # 60998
dm-raid1-abstract-get_valid_mirror-function.patch # 61000
dm-raid1-remove-bio_endio-from-dm_rh_mark_nosync.patch # 61001

dm-raid1-explicitly-initialise-bio_lists.patch # 60996

dm-ioctl-prefer-strlcpy-over-strncpy.patch # 48607
dm-snapshot-avoid-else-clause-in-persistent_read_metadata.patch # 49547
dm-snapshot-simplify-sector_to_chunk-expression.patch # 49550
dm-snapshot-abstract-minimum_chunk_size-fn.patch # 49553
dm-snapshot-consolidate-insert-exception-functions.patch # 50617
dm-snapshot-rename-dm_snap_exception-to-dm_exception.patch # 50620
dm-snapshot-rename-exception_table-to-dm_exception_table.patch # 50621
dm-snapshot-rename-exception-functions.patch # 50622
dm-snapshot-add-allocated-metadata-to-snapshot-status.patch # 52529
dm-snapshot-move-cow-ref-from-exception-store-to-snap-core.patch # 51771
dm-snapshot-track-suspended-state-in-target.patch # 55021

dm-kcopyd-accept-zero-size-jobs.patch # 56920

dm-abstract-dm_in_flight-function.patch # 54148
dm-use-clone-in-map_request-function.patch # 54149
dm-pass-gfp_mask-to-alloc_rq_tio.patch # 54150
dm-abstract-clone_rq.patch # 54151
dm-simplify-request-based-suspend.patch # 54152
dm-use-md-pending-for-in-flight-IO-counting.patch # 54153
dm-refactor-request-based-completion-functions.patch # 54154
dm-move-dm_end_request.patch # 54155
dm-add-request-based-barrier-support.patch # 54157

dm-rename-dm_get_table-to-dm_get_live_table.patch

dm-mpath-flush-workqueues-before-suspend-completes.patch # 59566
dm-add-dm_deleting_md-function.patch # 59740
#dm-table-add-dm_table_deleting_md-function.patch # 59741
dm-ioctl-forbid-messages-to-devices-being-deleted.patch # 59742

dm-mpath-add-mutex-to-synchronize-adding-and-flushing-work.patch # 60233
dm-mpath-prevent-io-from-work-queue-while-suspended.patch # 60234

dm-io-handle-empty-barriers.patch # 20123

dm-ioctl-retrieve-status-from-inactive-table.patch # 57990

dm-bind-new-table-before-destroying-old.patch # 59225
dm-keep-old-table-until-after-resume-succeeded.patch # 59240

dm-snapshot-allow-live-exception-store-handover-between-tables.patch # 61771
#dm-snapshot-add-parameter-to-avoid-allocation-in-register_snapshot.patch
#dm-snapshot-allow-live-exception-store-handover-between-tables-old3.patch # 58946
#dm-snapshot-allow-live-exception-store-handover-between-tables-old2.patch # 58094
#dm-snapshot-allow-live-exception-store-handover-between-tables-old.patch # 55022, 55569, 57787

dm-trace-request-based-remapping.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-raid1-support-flush.patch # 20124
3-8-raid1-barriers.patch # 20125
4-8-raid1-barriers.patch # 20128
5-8-raid1-barriers.patch # 20129
6-8-raid1-barriers.patch # 20130
7-8-raid1-barriers.patch # 20131
8-8-raid1-barriers.patch # 20132

7-7-Hold-all-write-bios-when-errors-are-handled.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