From: Linus Torvalds Date: Tue, 15 Dec 2009 17:12:01 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53365383c4667aba55385cd1858582c19a7a8a36;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (80 commits) dm snapshot: use merge origin if snapshot invalid dm snapshot: report merge failure in status dm snapshot: merge consecutive chunks together dm snapshot: trigger exceptions in remaining snapshots during merge dm snapshot: delay merging a chunk until writes to it complete dm snapshot: queue writes to chunks being merged dm snapshot: add merging dm snapshot: permit only one merge at once dm snapshot: support barriers in snapshot merge target dm snapshot: avoid allocating exceptions in merge dm snapshot: rework writing to origin dm snapshot: add merge target dm exception store: add merge specific methods dm snapshot: create function for chunk_is_tracked wait dm snapshot: make bio optional in __origin_write dm mpath: reject messages when device is suspended dm: export suspended state to targets dm: rename dm_suspended to dm_suspended_md dm: swap target postsuspend call and setting suspended flag dm crypt: add plain64 iv ... --- 53365383c4667aba55385cd1858582c19a7a8a36