linux-next: manual merge of the vfs-brauner tree with the nfs tree

[Stephen Rothwell]

Hi all,

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

  fs/nfs/symlink.c

between commit:

  134d0b3f2440 ("nfs: propagate readlink errors in nfs_symlink_filler")

from the nfs tree and commit:

  8f3ab6e4bebe ("nfs: Remove calls to folio_set_error")

from the vfs-brauner tree.

I fixed it up (the latter included the change from thr 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: pgp9z6bXKO925.pgp
Description: OpenPGP digital signature