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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the fscache tree got conflicts in:

  fs/9p/cache.c
  fs/9p/vfs_addr.c

between commit:

  bc868036569e ("9p: Fix a bunch of kerneldoc warnings shown up by W=1")

from Linus' tree and commit:

  fcd4c99b70ce ("9p: Convert to using the netfs helper lib to do reads and caching")

from the fscache tree.

I fixed it up (I used the latter versions) 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: pgpq5rremKbJL.pgp
Description: OpenPGP digital signature