##############################################################################
# File based on 2.6.21
##############################################################################

##############################################################################
# Upstream changes since release
##############################################################################
origin.patch

##############################################################################
# Upstream via -mm
##############################################################################
dm-raid1-one-kmirrord-per-mirror.patch

dm-crypt-disable-barriers.patch

dm-crypt-fix-call-to-clone_init.patch
dm-crypt-fix-avoid-cloned-bio-ref-after-free.patch
dm-crypt-fix-remove-first_clone.patch
dm-crypt-use-smaller-bvecs-in-clones.patch

dm-crypt-add-null-iv.patch

dm-mpath-log-device-name.patch
dm-allow-offline-devices.patch

dm-log-fault-detection.patch
dm-log-report-fault-status.patch
dm-raid1-add-handle_errors-feature-flag.patch

dm-io-delay-dec_count.patch

dm-io-prepare-for-new-interface.patch
dm-io-new-interface.patch
dm-kcopyd-update-dm-io-interface.patch
dm-exception-store-update-dm-io-interface.patch
dm-log-update-dm-io-interface.patch
dm-raid1-update-dm-io-interface.patch
dm-io-remove-old-interface.patch

dm-bio-list-helpers.patch

dm-delay.patch

dm-raid1-fix-to-commit-pending-clear-region-requests.patch
dm-raid1-switch-rh_in_sync-to-blocking-in-do_reads.patch
dm-log-fix-resume-failed-log-device.patch

##############################################################################
# Patches already included in -mm from other sources
##############################################################################

##############################################################################
# This section of patches gets imported into -mm.
#
# MM_PATCHES_START
##############################################################################

# Clean up earlier patches
dm-bio_list-macro-renaming.patch
dm-bio_list-prefetch-removal.patch
dm-use-kmem_cache-macro.patch
dm-use-singlethread-workqueues.patch
dm-delay-cleanup.patch
dm-remove-duplicate-module-name-from-error-msgs.patch

# Fixes
dm-merge-max_hw_sector.patch
dm-raid1-fix-status.patch
dm-io-fix-panic-on-large-request.patch

# Enhancements

# Hold back until something uses this
dm-add-ratelimit-logging-macros.patch

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

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

kcopyd-use-mutex-instead-of-semaphore.patch
git-gccbug.patch

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

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

# Extended message passing to userspace - 2.6.23?
uml-fixes.patch
dm-netlink.patch
dm-netlink-add-to-core.patch
dm-netlink-mpath.patch

# An attempt to support larger bios for better performance with dm over md
# - Check these will merge cleanly into -mm then submit them for more
# people to try
dm-md-merge_bvec_fn-with-separate-bdev-and-sector.patch
dm-introduce-merge_bvec_fn.patch
dm-linear-add-merge.patch
dm-table-remove-merge_bvec-sector-restriction.patch

##############################################################################
# Under review - only try the remaining patches if you know what you're doing!
# Some don't even compile.
##############################################################################

# An alternative to loop
dm-loop-config.patch
dm-loop.patch

# Need integrating and cleaning up
dm-memcache.patch
dm-extract-region_hash.patch
dm-iostats.patch
dm-throttle.patch

# Won't be submitted - different solution being worked on in scsi
bio-sense-data.patch
dm-mpath-hw-handler-sense-data.patch

# Depends on above
dm-mpath-rdac.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

# Needs extracting from earlier version lower down
dm-snapshot-hold-primary_pe-reference.patch


dm-raid1-mempool-bug-workaround-reversion.patch

dm-raid1-read-balancing.patch

dm-userspace.patch


# Need more work before this one from -mm can be applied:
# - bio splitting memory issues
md-dm-reduce-stack-usage-with-stacked-block-devices.patch

dm-mpath-default-to-scsi-err-handler.patch

# Needs solving a different way
dm-snapshot-chunksize-fix.patch

# Needs further tidying.  Add rate-limiting to messages?
dm-mpath-improve-err-mesgs.patch

# For testing: tidy, enhance & submit upstream
dm-flakey.patch

# Need re-working to take account of other changes made since.
dm-snapshot-fix-origin-writes.patch
dm-snapshot-tidy-snapshot_map-original.patch
dm-snapshot-add-workqueue-original.patch
dm-snapshot-track-snapshot-reads.patch