Messages in this thread | | | Date | Thu, 10 Jun 2010 13:52:03 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drbd tree with the block trees |
| |
Hi all,
Today's linux-next merge of the drbd tree got a conflicts in fs/fs-writeback.c against the block tree.
It looks like the block tree has moved under the drbd tree again. I used the version of this file from the block tree for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |