##############################################################################
# File based on v2.6.38-rc4
##############################################################################

##############################################################################
# Upstream changes since release
##############################################################################
git-update1.patch # v2.6.38-rc4-106-gd247852
git-update2.patch # v2.6.38-rc4-213-g055d219
git-update3.patch # v2.6.38
git-update4.patch # v2.6.38-7054-g4bbba11
git-update5.patch # v2.6.38-8569-g16c29da
git-update6.patch # v2.6.39
git-update7.patch # v2.6.39-6621-ga74b81b
git-update8.patch # v2.6.39-7551-g139f37f
git-update9.patch # v3.0
git-update10.patch # v3.0-rc1-11-gaf0d6a0
git-update11.patch # v3.0-rc3-256-gde505e7
git-update12.patch # v3.0-rc6-16-ga2fa83f
git-update13.patch # v3.0-rc7-72-g5dcd07b
git-update14.patch # v3.0
git-update15.patch # v3.0-6046-g55f9c40
git-update16.patch # v3.0-7216-ged8f373
git-update17.patch # v3.1-rc1

##############################################################################
# Base against linux-next this cycle
##############################################################################

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

##############################################################################
# 'git describe'
# BASE v3.0-7216-ged8f373
##############################################################################

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

## 8 patches sent to Linus 2011/03/24 for 2.6.39
#dm-fix-opening-log-and-cow-devices-for-read-only-tables.patch # 558911
#dm-add-flakey-target.patch # 75218
#dm-crypt-wipe-keys-string-immediately-after-key-is-set.patch # 528101
#dm-ioctl-prepare-for-crypt-key-wiping.patch # 528111
#dm-ioctl-add-flag-to-wipe-buffers-for-secure-data.patch # 528121
#dm-mpath-fail-message-ioctl-if-specified-path-is-not-valid.patch # 520161
#dm-mpath-allow-table-load-with-no-priority-groups.patch # 520171
#dm-stripe-implement-merge-method.patch # 639801


## 11 patches sent to Linus 2011/05/29 for 2.6.40-rc1
#dm-table-allow-targets-to-support-discards-internally.patch # 737831
#dm-table-reject-devices-without-request-fns.patch # 671762
#dm-mpath-do-not-fail-paths-after-integrity-errors.patch # 669872
#dm-kcopyd-avoid-pointless-job-splitting.patch # 798162
#dm-kcopyd-preallocate-sub-jobs-to-avoid-deadlock.patch # 798112
#dm-kcopyd-remove-superfluous-page-allocation-spinlock.patch # 798152
#dm-kcopyd-add-gfp-parm-to-alloc_pl.patch # 816612
#dm-kcopyd-alloc-pages-from-the-main-page-allocator.patch # 816622
#dm-io-use-fixed-initial-mempool-size.patch # 798132
#dm-kcopyd-reserve-fewer-pages.patch # 816632
#dm-kcopyd-return-client-directly-and-not-through-a-pointer.patch # 816642


## 34 patches sent to Linux 2011/08/02 for 3.1
#dm-snapshot-flush-disk-cache-when-merging.patch # 862722
#dm-mpath-fix-potential-NULL-pointer-in-feature-arg-processing.patch # 926002
#dm-io-flush-cpu-cache-with-vmapped-io.patch #  795612
#dm-fix-idr-leak-on-module-removal.patch
#dm-suppress-endian-warnings.patch
#dm-table-fix-discard-support.patch # 993642
#dm-log-clean-up-bit-little-endian-bitops.patch # 918992
#dm-log-userspace-use-list_move.patch # 639041
#dm-use-vzalloc.patch # 826722
#dm-kcopyd-remove-offset-field-from-job-structure.patch # 844772
#dm-kcopyd-remove-nr_pages-field-from-job-structure.patch # 844792
#dm-snapshot-remove-unused-definitions.patch # 862712
#dm-snapshot-style-cleanups.patch # 49432
#dm-raid-cleanup-parameter-handling.patch # 862812
#dm-ioctl-prevent-empty-message.patch
#dm-raid-tidy-includes.patch
#dm-table-clean-dm_get_device-and-move-exports.patch # 980532
#dm-ignore-merge_bvec-for-snapshots-when-safe.patch # 907632
#dm-snapshot-skip-reading-origin-when-overwriting-complete-chunk.patch # 914972
#dm-table-share-target-argument-parsing-functions.patch # 922192
#dm-flakey-use-dm_target_offset-and-support-discards.patch # 922182
#dm-flakey-support-feature-args.patch # 922242
#dm-flakey-add-drop_writes.patch # 922222
#dm-flakey-add-corrupt_bio_byte-feature.patch # 922252 922202 922212 922232
#dm-ioctl-fill-in-device-parameters-in-more-ioctls.patch #  937182
#dm-ioctl-introduce-__get_dev_cell.patch # 937162
#dm-ioctl-forbid-multiple-device-specifiers.patch # 937172
#dm-raid-improve-table-parameters-documentation.patch # 862742
#dm-raid-add-region_size-parameter.patch # 862822
#dm-raid-add-write_mostly-parameter.patch # 862772
#dm-raid-support-metadata-devices.patch #  862782
#dm-raid-add-md-raid1-support.patch # 862792
#dm-crypt-optionally-support-discard-requests.patch # 974902
#dm-table-set-flush-capability-based-on-underlying-devices.patch # 1021462


# Thin provisioning patches 
# - Corruption got fixed, but too late for the current merge window.
dm-kcopyd-add-dm_kcopyd_zero-to-zero-an-area.patch # 862702
dm-table-add-singleton-feature.patch
dm-table-add-always-writeable-feature.patch
dm-export-dm-get-md.patch

dm-add-persistent-data-library.patch
dm-add-thin-provisioning-target.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
##############################################################################

##############################################################################
# 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-use-local-printk-ratelimit.patch # 1036162

dm-thin-change-status-line.patch

##############################################################################
# End of patches that apply cleanly and are under active review.
##############################################################################

end

#dm-thin-mutex.patch
#dm-thin-fix-shutdown-memleak.patch
#dm-thin-retest
#dm-lock-tm.patch

#1-3-dm-add-dm_bdev.patch
#dm-do-not-export-dm_disk.patch

#dm-add-persistent-data-library-old.patch
#dm-persistent-data-joe-update1.patch
#dm-persistent-data-joe-update2.patch
#dm-persistent-data-kconfig.patch

#dm-add-thin-provisioning-target-old.patch
#dm-thin-fix-congestion.patch
#dm-thin-fix-includes.patch
#dm-thin-misc-cleanups.patch
#dm-thin-joe-update1.patch
#dm-thin-make-singleton.patch
#dm-thin-joe-update2.patch
#dm-thin-use-tc-pool.patch
#dm-thin-misc-non-functional-changes.patch
#dm-thin-use-map_context.patch
#dm-thin-remove-bi_private-hacks.patch
#dm-thin-always-writeable.patch
#dm-thin-message-tidy.patch
#dm-thin-kstrtoull,patch
#dm-thin-fix-module-name.patch
#dm-thin-remove-endio-macros.patch
#dm-thin-kconfig-fix.patch
#dm-thin-update-doc.patch

# dm-thin-rename-doc.patch
dm-add-bufio.patch
dm-add-zeroed-target.patch
dm-table-export-singleton-target.patch
# dm-thin-remove-dm_bdev.patch

dm-table-propagate-non-rotational-flag.patch # 821762

# Depends on agreement for exported symbol
dm-table-extend-device-name-lookups.patch # 101025

# older patches

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

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

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-daniel.patch


dm-snapshot-cleanup-style.patch

# 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


# 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

dm-tidy-io-initialisation-functions.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-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