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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 872 bytes --]

Hi all,

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

  fs/buffer.c

between commit:

  1420c4a549bf ("fs/buffer: Combine two submit_bh() and ll_rw_block() arguments")

from the block tree and commit:

  215e71b6ee7a ("fs: remove the nobh helpers")

from the folio tree.

I fixed it up (the latter removed some code that was updated by 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.

BTW: the latter commit missed a reference to nobh_write_begin in
Documentation/filesystems/porting.rst.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]