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

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  726464596b5d ("MAINTAINERS: eCryptfs: Update maintainer address and downgrade status")

from Linus' tree and commit:

  19e91e543c82 ("MAINTAINERS: adjust to filesystem doc ReST conversion")

from the jc_docs tree.

I fixed it up (see below) 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

diff --cc MAINTAINERS
index 8882742b0f5b,38f58b85eb06..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3917,10 -3906,10 +3917,10 @@@ W:	http://ceph.com
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
  T:	git git://github.com/ceph/ceph-client.git
  S:	Supported
- F:	Documentation/filesystems/ceph.txt
+ F:	Documentation/filesystems/ceph.rst
  F:	fs/ceph/
  
 -CERTIFICATE HANDLING:
 +CERTIFICATE HANDLING
  M:	David Howells <dhowells@xxxxxxxxxx>
  M:	David Woodhouse <dwmw2@xxxxxxxxxxxxx>
  L:	keyrings@xxxxxxxxxxxxxxx
@@@ -5948,8 -5937,8 +5948,8 @@@ L:	ecryptfs@xxxxxxxxxxxxxx
  W:	http://ecryptfs.org
  W:	https://launchpad.net/ecryptfs
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 -S:	Supported
 +S:	Odd Fixes
- F:	Documentation/filesystems/ecryptfs.txt
+ F:	Documentation/filesystems/ecryptfs.rst
  F:	fs/ecryptfs/
  
  EDAC-AMD64

Attachment: pgp3qII770r5p.pgp
Description: OpenPGP digital signature