##############################################################################
# File based on v2.6.35-rc3
##############################################################################

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

git-update1.patch # v2.6.35-rc5-176-gcd5b8f8
git-update2.patch # v2.6.35
git-update3.patch # v2.6.35-4807-g4a386c3
git-update4.patch # v2.6.35-6998-g3d30701
git-update5.patch # v2.6.35-7500-g5af568c
git-update6.patch # v2.6.35-7788-g320b2b8

##############################################################################
# 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.35-7788-g320b2b8
##############################################################################

##############################################################################
# Hack to avoid linux-next conflict
##############################################################################

## block-unify-flags-for-struct-bio-and-struct-request.patch

## 33 patches submitted to Linus for 2.6.36-rc1 2010/08/13

#dm-mpath-fix-NULL-pointer-dereference-when-path-parameters-missing.patch #105626
#dm-snapshot-iterate-origin-and-cow-devices.patch # 85880
#dm-snapshot-test-chunk-size-against-both-origin-and-snapshot.patch # 85881 85882 85883
#dm-ioctl-remove-__dev_status-from-geometry-and-target-message.patch # 100493
#dm-ioctl-make-__dev_status-void.patch
#dm-ioctl-return-uevent-flag-after-rename.patch # 100492
#dm-prevent-access-to-md-being-deleted.patch # 104927
#dm-ioctl-release-_hash_lock-between-devices-in-remove_all.patch # 104928
#dm-separate-device-deletion-from-dm_put.patch # 116695

#dm-ioctl-use-nonseekable_open.patch # 95514
#dm-crypt-use-kstrdup.patch # 99694
#dm-snapshot-persistent-use-define-for-disk-header-chunk-size.patch # 101778
#dm-skip-second-flush-on-bio-unsupported-error.patch # 110746 110887
#dm-ioctl-make-bio-or-request-based-device-type-immutable.patch # 108633
#dm-do-not-initialise-full-request-queue-when-bio-based.patch # 108698
#dm-snapshot-implement-merge.patch # 96976

#dm-ioctl-refactor-dm_table_complete.patch # 104859

#dm-rename-map_info-flush_request-to-target_request_nr.patch # 114062

#dm-allow-autoloading-of-dm-mod.patch # 115189

#dm-crypt-simplify-crypt_config-destruction-logic.patch
#dm-crypt-simplify-crypt_ctr.patch

#dm-linear-support-discard.patch # 108499 114070 114071
##dm-linear-support-discard-fixup.patch # FOLD OR REMOVE DEPENDING ON BLOCK

#dm-use-common-__issue_target_request-for-flush-and-discard-support.patch # 114072

#dm-factor-out-max_io_len_target_boundary.patch # 114345
#dm-use-dm_target_offset-macro.patch

#dm-zero-silently-drop-discards.patch # 114068
#dm-delay-support-discard.patch # 114063
#dm-error-return-error-for-discards.patch #114065
#dm-stripe-move-sector-translation-to-a-function.patch # 114866
#dm-stripe-optimize-sector-division.patch # 114836

#dm-split-discard-requests-on-target-boundaries.patch # 114354
#dm-stripe-support-discards.patch # 114677
#dm-mpath-support-discard.patch # 114341

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

##############################################################################
# Revert patch linux-next conflict avoidance patch
##############################################################################

##block-unify-flags-for-struct-bio-and-struct-request-revert.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
##############################################################################

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

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

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

mm

##############################################################################
# Via Jens
##############################################################################
# block-update-request-stacking-methods-to-support-discards.patch # 114064 

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

# dm-stripe-support-discards-old.patch # 114066
dm-table-extend-device-name-lookups.patch # 101025

dm-add-flakey-target.patch # 75218

# older patches

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

dm-mpath-refactor-pg_init-trigger.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