##############################################################################
# File based on 2.6.33-rc2
##############################################################################

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

git-update1.patch # v2.6.33-rc2-268-g45d28b0
git-update2.patch # v2.6.33-rc4-22-g004b350
git-update3.patch # v2.6.33-rc5-238-gb04da8b
git-update4.patch # v2.6.33-rc5-306-g64a028a
git-update5.patch # v2.6.33-rc6
git-update6.patch # v2.6.33-rc8-26-g0813e22
git-update7.patch # v2.6.33-rc8-38-g8862627
git-update8.patch # v2.6.33
git-update9.patch # v2.6.33-5070-g64ba992

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

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

## 7 patches sent to Linus 2010-02-16
#dm-stripe-avoid-divide-by-zero-with-invalid-stripe-count.patch # 76915
#dm-snapshot-persistent-annotate-work_queue-as-on-stack.patch # 75065
#dm-log-userspace-fix-overhead_size-calcuations.patch # 68612
#dm-raid1-fail-writes-if-errors-are-not-handled-and-log-fails.patch # 76000
#dm-raid1-fix-null-pointer-dereference-in-suspend.patch # 72253
#dm-mpath-fix-stall-when-requeueing-io.patch # 76618
#dm-sysfs-revert-add-empty-release-function-to-avoid-debug-warning.patch

# For next kernel
dm-mpath-pass-struct-pgpath-to-pg-init-done.patch # 71091
dm-mpath-skip-activate_path-for-failed-paths.patch # 71191
dm-table-remove-dm_get-from-dm_table_get_md.patch # 70606
dm-document-when-snapshot-has-finished-merging.patch # 75535
dm-mpath-avoid-storing-private-suspended-state.patch # 69103
dm-mpath-hold-io-until-all-pg_inits-completed.patch # 76026
dm-mpath-wait-for-pg_init-completion-when-suspending.patch # 76027
dm-mpath-refactor-pg_init.patch # 76028
dm-raid1-always-return-error-if-all-legs-fail.patch # 76433
dm-ioctl-only-issue-uevent-on-resume-if-state-changed.patch # 75194
dm-table-remove-unused-dm_get_device-range-parameters.patch # 78419
dm-free-dm_io-before-bio_endio-not-after.patch # 83109
dm-ioctl-introduce-flag-indicating-uevent-was-generated.patch # 82869
dm-eliminate-some-holes-data-structures.patch # 68857
dm-raid1-fix-deadlock-when-suspending-failed-device.patch # 80130
dm-add-flakey-target.patch # 75218

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

dm-table-limit-max_segments-when-no-merge_bvec-fn.patch # 83666

dm-mpath-refactor-pg_init-trigger.patch # 76028
#dm-mpath-refactor-pg_init-trigger-old.patch # 76028

#dm-table-fix-alignment-stacking-on-partitioned-devices.patch # 69586

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

# 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