linux-kernel - linux-next: manual merge of the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20200323105032.2a068daa@canb.auug.org.au>
Date:   Mon, 23 Mar 2020 10:50:32 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Tyler Hicks <tyhicks@...onical.com>,
        Lukas Bulwahn <lukas.bulwahn@...il.com>
Subject: linux-next: manual merge of the jc_docs tree with Linus' tree

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@...hat.com>
  M:	David Woodhouse <dwmw2@...radead.org>
  L:	keyrings@...r.kernel.org
@@@ -5948,8 -5937,8 +5948,8 @@@ L:	ecryptfs@...r.kernel.or
  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

Content of type "application/pgp-signature" skipped