##############################################################################
# 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
git-update9.patch # v2.6.32-rc8-11-ga8a8a66
git-update10.patch # v2.6.32
git-update11.patch # v2.6.32-5254-g3067e02
git-update12.patch # v2.6.32-6793-gf405425
git-update13.patch # v2.6.32-7500-g8bea867
git-update14.patch # v2.6.33-rc1-154-gf7b84a6
git-update15.patch # v2.6.33-rc2

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

# 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

## 80 patches sent to Linus 2009/12/11 for 2.6.33-rc1
## 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-snapshot-only-take-lock-for-statustype-info-not-table.patch # 63756
#dm-snapshot-cope-with-chunk-size-larger-than-origin.patch # 52096
#
#dm-crypt-make-wipe-message-also-wipe-tfm-key.patch
#dm-crypt-move-private-iv-fields-to-structs.patch
#dm-crypt-restructure-essiv-error-path.patch
#dm-crypt-separate-essiv-allocation-from-initialisation.patch
#dm-crypt-make-wipe-message-also-wipe-essiv-key.patch
#
## For 2.6.33-rc1
#dm-io-use-slab-for-struct-io.patch # 59231
#dm-io-remove-extra-bi_io_vec-region-hack.patch # 59233
#
## Full raid1 barrier support
#dm-raid1-support-flush.patch # 20124
#dm-raid1-split-touched-state-into-two.patch # 20125
#dm-log-add-flush_header-function.patch # 20128
#dm-log-introduce-flush_failed-variable.patch # 20130
#dm-log-add-flush-callback-fn.patch # 20129
#dm-log-use-flush-callback-fn.patch # 20131
#dm-raid1-implement-mirror_flush.patch # 20132
#dm-raid1-report-flush-errors-separately-in-status.patch # 60608
#
#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-hold-write-bios-when-errors-are-handled.patch # 61004
#dm-raid1-hold-all-write-bios-when-leg-fails.patch # 63219
#
#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 # 49744
#
#dm-crypt-add-plain64-iv.patch
#
#dm-swap-target-postsuspend-call-and-setting-suspended-flag.patch # 61588
#dm-rename-dm_suspended-to-dm_suspended_md.patch # 61589
#dm-export-suspended-state-to-targets.patch # 61594
#dm-mpath-reject-messages-when-device-is-suspended.patch # 61595
#
#dm-snapshot-make-bio-optional-in-__origin_write.patch
#dm-snapshot-create-function-for-chunk_is_tracked-wait.patch # 64973
#dm-exception-store-add-merge-specific-methods.patch # 64745, 65586
#dm-snapshot-add-merge-target.patch # 64747
#dm-snapshot-rework-writing-to-origin.patch # 64744 
#dm-snapshot-avoid-allocating-exceptions-in-merge.patch # 64748
#dm-snapshot-support-barriers-in-snapshot-merge-target.patch # 65758
#dm-snapshot-permit-only-one-merge-at-once.patch # 64749
#dm-snapshot-add-merging.patch #64750, 65535
#dm-snapshot-queue-writes-to-chunks-being-merged.patch # 64751
#dm-snapshot-delay-merging-a-chunk-until-writes-to-it-complete.patch # 64752
#dm-snapshot-trigger-exceptions-in-remaining-snapshots-during-merge.patch # 64753, 65536
#dm-snapshot-merge-consecutive-chunks-together.patch # 64755
#dm-snapshot-report-merge-failure-in-status.patch # 65056
#dm-snapshot-use-merge-origin-if-snapshot-invalid.patch # 64754
#
##############################################################################
# This section of patches gets imported into linux-next after the block tree.
# - Temporarily disabled: NEXT*BASE block 
# NEXT_PATCHES_START
##############################################################################


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

# replicator
v2-dm-eliminate-some-holes-in-data-structures.patch
dm-mpath-Remove-suspended-flag-from-struct-multipath.patch
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-bufio.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-mikulas.patch

dm-multisnap-daniel.patch


dm-snapshot-cleanup-style.patch
#v5-03-13-dm-exception-store-snapshot-merge-usage-accounting.patch # 64746

# Experimental
dm-emulate-BLKRRPART-ioctl.patch

dm-region_hash-change-primes.patch

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

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