Today's linux-next merge of the xfs tree got a conflict infs/xfs/linux-2.6/xfs_buf.c between commit 7eaceaccab5f ("block: removeper-queue plugging") from Linus' tree and commit 0e6e847ffe37 ("xfs: stopusing the page cache to back the buffer cache") from the xfs tree.

I assume that these changes (on both sides) were discussed somewhere, butmaybe not clearly enough?

I have no idea how to fix this, so I tried to just use the xfs treeversion for today. That failed like this: