##############################################################################
# File based on v3.2
##############################################################################

##############################################################################
# Upstream changes since release
##############################################################################
git-update1.patch # v3.2-9429-g90a4c0f
git-update2.patch # v3-3-rc1
git-update3.patch # v3.3-rc2
git-update4.patch # v3.3-rc3
git-update5.patch # v3.3-rc6
git-update6.patch # v3.3-rc6-226-g0ab5d75
git-update7.patch # v3.3-rc7-17-g2f1c2b8
git-update8.patch # v3.3
git-update9.patch
git-update10.patch # v3.3-5825-g4375382
git-update11.patch # v3.3-8070-g529b73f
git-update12.patch # v3.4-rc2
git-update13.patch # v3.4-rc5
git-update14.patch # v3.4-rc5-67-gac001e7
git-update15.patch # v3.4-rc6
git-update16.patch # v3.4-rc7
git-update17.patch # v3.4
git-update18.patch # v3.4-9426-g76f901e
git-update19.patch # v3.4-10118-g233e562
git-update20.patch # v3.5-rc1

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

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

base

##############################################################################
# References used to be to http://patchwork.kernel.org/patch// but
# currently refer to a private patchwork instance.
# N.B. Patches and headers may have been modified since submission.
##############################################################################

##############################################################################
# 'git describe'
# BASE v3.4-10118-g233e562
##############################################################################

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

# Fixes

# Upstream via Neil
# dm-raid-only-call-bitmap_load-once-to-avoid-corruption.patch # 43570

## 8 Fixes for 3.3-rc7 sent to Linus 2012/03/07
#dm-ioctl-do-not-leak-argv-if-target-message-only-contains-whitespace.patch # 42206
#dm-io-fix-discard-support.patch # 42561
#dm-flakey-fix-crash-on-read-when-corrupt_bio_byte-not-set.patch # 45659
#dm-thin-metadata-remove-incorrect-close_device-on-creation-error-paths.patch # 42880
#dm-thin-metadata-unlock-superblock-in-init_pmd-error-path.patch # 43668
#dm-thin-metadata-decrement-counter-after-removing-mapped-block.patch # 43676
#dm-raid-set-MD_CHANGE_DEVS-when-rebuilding.patch # 42527
#dm-raid-fix-flush-support.patch # 45601

## 27 patches for 3.4-rc1 sent to Linux 2012/03/27
## Patches for 3.4
## - fixes
#dm-exception_store-fix-init-error-path.patch # 45536
#dm-crypt-fix-mempool-deadlock.patch # 45906
#dm-crypt-add-missing-error-handling.patch # 43167

## dm-thin-fix-stacked-bi_next-usage-joe.patch
## dm-thin-fix-stacked-bi_next-usage-cleanup.patch
#dm-thin-fix-stacked-bi_next-usage.patch # 45893 

#dm-persistent-data-fix-btree-rebalancing-after-remove.patch # 45895

## Went upstream via another route
## dm-crypt-remove-unused-kmap_atomic-arg.patch # 44285
## dm-bufio-remove-version-header.patch # 43066

## - cleanups
#dm-document-sysfs-entries.patch # 42562
#dm-add-persistent-data-to-MAINTAINERS.patch
#dm-uevent-no-longer-experimental.patch
#dm-raid-no-longer-experimental.patch
#dm-thin-correct-comments.patch # 45891 45896
#dm-table-simplify-call-to-free_devices.patch # 45910
#dm-clear-bi_end_io-on-remapping-failure.patch # 45911
#dm-mpath-detect-invalid-map_context.patch # 45976
#dm-persistent-data-remove-redundant-value_size-arg-from-value_ptr.patch # 43171
#dm-thin-metadata-pass-correct-space-map-to-dm_sm_root_size.patch # 45890

## - minor enhancements
#dm-raid-handle-failed-devices-during-start-up.patch # 42557
#dm-reject-trailing-characters-in-sccanf-input.patch # 45386
#dm-thin-commit-outstanding-data-every-second.patch # 43675
#dm-persistent-data-remove-space-map-ref_count-entries-if-redundant.patch # 45897
#dm-thin-relax-hard-limit-on-the-maximum-size-of-a-metadata-device.patch # 45697
#dm-thin-support-read-only-external-snapshot-origins.patch # 45894
#dm-thin-use-dm_target_offset.patch
#dm-thin-prepare-to-support-discard.patch # 45900
#dm-thin-support-discards.patch # 45901
#dm_thin-add-pool-target-flags-to-control-discard.patch # 45898

#dm-bufio-prefetch.patch # 45829
#dm-add-verity-target.patch # 45991 45685
## dm-add-verity-target-docs.patch # 45685

# 4 patches sent to Linus 2012/05/11 for 3.4-rc7
## Regression in -rc1
#dm-thin-reinstate-missing-mempool_free-in-cell_release_singleton.patch # 46265

## Fixes for 3.4
#dm-thin-correct-module-description.patch
#dm-thin-fix-unprotected-use-of-prepared_discards-list.patch # 46485
#dm-mpath-check-if-scsi_dh-module-already-loaded-before-trying-to-load.patch # 47028

## Last-minute fix for 3.4 sent to Linus for 3.4 final 2012/05/19
#dm-thin-fix-table-output-when-pool-target-disables-discard-passdown-internally.patch # 47164

## 5 patches sent to Linus for 3.5-rc1 2012/06/02
#dm-mpath-reduce-size-of-struct-multipath.patch # 47031
#dm-mpath-delay-retry-of-bypassed-pg.patch # 46333
#dm-mpath-allow-ioctls-to-trigger-pg-init.patch # 47053
#dm-thin-use-slab-mempools.patch # 46267
#dm-thin-provide-userspace-access-to-pool-metadata.patch # 47208 47143

dm-support-non-power-of-two-target-max_io_len.patch # 46944

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

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

end



dm-add-div-wrappers.patch
dm-thin-support-for-non-power-of-2-pool-blocksize.patch # 46956
dm-stripe-support-for-non-power-of-2-chunksize.patch # 46946

# dm patch depends on scsi patch - sort out submission
scsi_dh-add-scsi_dh_attached_handler_name.patch # 47083
dm-mpath-add-default_hw_handler-feature.patch # 47082

dm-mpath-add-ability-to-disable-partition-creation.patch # 47029



# folded into patch above
#dm-thin-allow-userland-access-to-metadata-of-a-live-thin-provisioning-pool-supplement.patch # 47143

dm-kcopyd-add-WRITE-SAME-support-to-dm_kcopyd_zero.patch # 45682

###

dm-update-max_io_len-to-support-a-split_io-that-is-not-a-power-of-2.patch # 46699

# Fix needs separating from the refactoring and then documenting.
#break-up-__rebalance3-function..patch
#dm-btree-fix-rebalancing-on-removal.patch # 43672

# Two alternative verity implementations

# dm-add-verity-target.patch # 45685
##dm-add-verity-target-old.patch

#dm-add-verity-target-alternative.patch # 45832

dm-thin-commit-metadata-before-providing-status.patch # 45899
# dm-mpath-clear-map_context-when-requeueing.patch # 42534

dm-add-zeroed-target.patch
#dm-document-sysfs.patch
dm-table-export-singleton-target.patch

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