From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Wed, 1 Aug 2012 10:43:01 +0000 (+0200)
Subject: drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/
X-Git-Tag: v3.8-rc1~78^2~18^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427c0434fc52f15bd762ddc6611e874df6cc5b8d;p=pandora-kernel.git

drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/

We don't discard anything here, really.
We resolve conflicting, concurrent writes to overlapping data blocks.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---

Reading git-diff-tree failed