git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4dabbe
)
drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/
author
Lars Ellenberg
<lars.ellenberg@linbit.com>
Wed, 1 Aug 2012 10:43:01 +0000
(12:43 +0200)
committer
Philipp Reisner
<philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:05:49 +0000
(14:05 +0100)
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>
No differences found