linux-next: manual merge of the tmem tree with the vfs tree
From: Stephen Rothwell
Date: Wed Dec 28 2011 - 02:07:48 EST
Today's linux-next merge of the tmem tree got a conflict in fs/buffer.c
between commit b1cdabb05024 ("fs: move code out of buffer.c") from the
vfs tree and commit 294a90bcfd28 ("mm: cleancache: s/flush/invalidate/")
from the tmem tree.
The code that was modified by the latter was moved by the former. I
applied the following merge fixup patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 28 Dec 2011 18:05:28 +1100
Subject: [PATCH] tmem: fix up for code movement
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
fs/block_dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 69a5b6f..d6d5f29 100644
@@ -110,7 +110,7 @@ void invalidate_bdev(struct block_device *bdev)
/* 99% of the time, we don't need to flush the cleancache on the bdev.
* But, for the strange corners, lets be cautious
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature