linux-next: manual merge of the folio tree with the btrfs tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the folio tree got a conflict in:

  fs/btrfs/disk-io.c

between commit:

  fe9b88cb7288 ("btrfs: use preallocated page for super block write")

from the btrfs tree and commit:

  020ae1ea6060 ("btrfs: Use a folio in wait_dev_supers()")

from the folio tree.

I fixed it up (I did not know how to fix this up, so I used the former -
effectively reverting the latter) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpIvCRluE94k.pgp
Description: OpenPGP digital signature