Messages in this thread |  | | | Date | Mon, 28 Mar 2011 12:21:48 +1100 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the xfs tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the xfs tree got a conflict in fs/xfs/linux-2.6/xfs_buf.c between commit 7eaceaccab5f ("block: remove per-queue plugging") from Linus' tree and commit 0e6e847ffe37 ("xfs: stop using the page cache to back the buffer cache") from the xfs tree.
I assume that these changes (on both sides) were discussed somewhere, but maybe not clearly enough?
I have no idea how to fix this, so I tried to just use the xfs tree version for today. That failed like this:
fs/xfs/linux-2.6/xfs_buf.c: In function 'xfs_buf_lock': fs/xfs/linux-2.6/xfs_buf.c:923: error: implicit declaration of function 'blk_run_backing_dev'
So I used the xfs tree from next-20110325 for today.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |