linux-next: manual merge of the mm-unstable tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  fs/btrfs/extent_io.c

between commit:

  38e541051e1d ("btrfs: open code folio_index() in btree_clear_folio_dirty_tag()")

from Linus' tree and commit:

  88916e92c953 ("btrfs: drop usage of folio_index")

from the mm-unstable tree.

I fixed it up (basically the same change - I used the former) 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: pgpa0DAtWAVdE.pgp
Description: OpenPGP digital signature