##############################################################################
# File based on v3.5-rc1
##############################################################################

##############################################################################
# Upstream changes since release
##############################################################################
git-update1.patch # v3.5-rc4
git-update2.patch # v3.5-rc5
git-update3.patch # v3.5-rc6
git-update4.patch # v3.5-rc7
git-update5.patch # v3.5
git-update6.patch # v3.5-4773-gbdc0077
git-update7.patch # v3.5-7078-gf7da9cd
git-update8.patch # v3.5-7815-g37cd960
git-update9.patch # v3.6-rc1

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

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

base

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

##############################################################################
# Patches already in linux-next from other sources
##############################################################################
# scsi-add-scsi_dh_attached_handler_name # 7e8a74b177f17d100916b6ad415450f7c9508691

##############################################################################
# 'git describe --match v\*'
# BASE v3.6-rc1
##############################################################################

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

## 5 patches sent to Linus 2012/07/03 for 3.5-rc6
#dm-thin-commit-metadata-before-creating-metadata-snapshot.patch # 47572
#dm-persistent-data-fix-shadow_info_leak-on-dm_tm_destroy.patch # 47577
#dm-persistent-data-handle-space-map-checker-creation-failure.patch # 47629
#dm-persistent-data-fix-allocation-failure-in-space-map-checker-init.patch # 47630
#dm-verity-fix-documentation.patch # 47427


## 3 patches sent to Linus 2012/07/20 for 3.5
#dm-raid1-fix-crash-with-mirror-recovery-and-discard.patch # 48699
#dm-thin-do-not-send-discards-to-shared-blocks.patch # 48698
#dm-raid1-set-discard_zeroes_data_unsupported.patch # 48700


## 63 patches sent to Linus 2012/07/30 for 3.6-rc1
#dm-thin-reduce-endio_hook-pool-size.patch
#dm-thin-clean-up-compiler-warning.patch # 47941
#dm-remove-unused-flush-target-method.patch
#dm-persistent-data-remove-debug-space-map-checker.patch
#dm-thin-metadata-remove-pointless-label-from-__commit_transaction.patch
#dm-thin-metadata-introduce-THIN_MAX_CONCURRENT_LOCKS.patch
#dm-snapshot-remove-redundant-assignment-in-merge-fn.patch
#dm-replace-simple_strtoul.patch # 47344
#dm-thin-provide-specific-errors-for-two-table-load-failure-cases.patch # 47497
#dm-stripe-fix-size-test.patch # 47576
#dm-stripe-remove-stripes_mask.patch # 47567
#dm-support-non-power-of-two-target-max_io_len.patch # 46944
#dm-stripe-support-for-non-power-of-2-chunksize.patch # 46946
#dm-stripe-remove-minimum-stripe-size.patch # 47568
#dm-stripe-optimize-chunk_size-calculations.patch # 47566
##dm-thin-ensure-discard_granularity-is-power-of-2.patch # 48696
#dm-thin-support-for-non-power-of-2-pool-blocksize.patch # 46956 48696
#dm-introduce-split_discard_requests.patch # 48695
#dm-thin-split-discards-on-block-boundary.patch # 48694
#dm-thin-optimize-power-of-two-block-size.patch # 47569
#dm-mpath-add-retain_attached_hw_handler-feature.patch # 48539
#dm-raid-restructure-parse_raid_params.patch # 48467
#dm-raid-move-sectors_per_dev-calculation.patch # 48466
#dm-crypt-rename-pending-field.patch
#dm-crypt-move-cipher-data-out-of-per_cpu-struct.patch
#dm-crypt-store-crypt_config-instead-of-dm_target-struct.patch
#dm-crypt-rename-struct-convert_context-sector-field.patch
#dm-thin-fix-memory-leak-in-process_prepared_mapping-error-paths.patch
#dm-thin-avoid-unnecessarily-breaking-sharing-for-flushes.patch
#dm-persistent-data-always-unlock-superblock-in-dm_bm_flush_and_unlock.patch
#dm-persistent-data-only-commit-space-map-if-index-changed.patch
#dm-allow-targets-to-request-flushes-regardless-of-underlying-device-support.patch
#dm-thin-set-flush_supported.patch
#dm-use-bool-bitfields-in-struct-dm_target.patch
#dm-thin-metadata-factor-__setup_btree_details-out-of-init_pmd.patch
#dm-persistent-data-create-new-dm_block_manager-struct.patch
#dm-thin-metadata-stop-tracking-need-for-commit.patch
#dm-persistent-data-tidy-transaction-manager-creation-fns.patch
#dm-persistent-data-stop-using-dm_bm_unlock_move-when-shadowing-blocks-in-tm.patch
#dm-thin-metadata-wrap-superblock-locking.patch
#dm-thin-metadata-rename-init_pmd-to-__create_persistent_data_objects.patch
#dm-thin-metadata-move-bm-creation-code-into-create_persistent_data_objects.patch
#dm-thin-metadata-factor-__destroy_persistent_data-out-of-dm_pool_metadata_close.patch
#dm-thin-metadata-lift-some-initialisation-out-of-__open_or_format_metadata.patch
#dm-thin-metadata-factor-out-__write_initial_superblock.patch
#dm-thin-metadata-move-dm_commit_pool_metadata-into-__write_initial_superblock.patch
#dm-thin-metadata-lift-__begin_transaction-out-of-__write_initial_superblock.patch
#dm-thin-metadata-zero-unused-superblock-uuid.patch
#dm-thin-metadata-use-struct-dm_pool_metadata-members-in-__open_or_format_metadata.patch
#dm-thin-metadata-split-__open-or-format-metadata.patch
#dm-thin-metadata-remove-nr_blocks-arg-from-__create_persistent_data_objects.patch
#dm-thin-metadata-move-__superblock_all_zeroes-to-__open_or_format_metadata.patch
#dm-thin-metadata-remove-create-parameter-from-__create_persistent_data_objects.patch
#dm-thin-metadata-remove-duplicate-pmd-initialisation.patch
#dm-thin-metadata-only-check-incompat-features-on-open.patch
#dm-thin-metadata-tidy-up-open-and-format-error-paths.patch
#dm-thin-metadata-add-format-option-to-dm_pool_metadata_open.patch
#dm-thin-metadata-add-dm_thin_changed_this_transaction.patch
#dm-thin-reduce-number-of-metadata-commits.patch
#dm-persistent-data-introduce-dm_bm_set_read_only.patch
#dm-thin-metadata-introduce-dm_pool_metadata_set_read_only.patch
#dm-thin-metadata-introduce-dm_pool_abort_metadata.patch
#dm-thin-add-read-only-and-fail-io-modes.patch
#dm-thin-commit-before-gathering-status.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.
##############################################################################

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

end

dm-verity-fix-overflow-check.patch
dm-optimize-use-SRCU-and-RCU.patch # 47283
dm-optimize-reorder-structure.patch # 47284

dm-add-switch-target.patch

# dm-add-div-wrappers.patch

# 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

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

dm-thin-commit-metadata-before-providing-status.patch # 45899

dm-add-zeroed-target.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-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-region_hash-change-primes.patch

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

dm-add-ioband.patch

dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.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