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

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: <20200207085416.3f35cd31@canb.auug.org.au>
Date:   Fri, 7 Feb 2020 08:54:16 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miklos Szeredi <miklos@...redi.hu>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Daniel W. S. Almeida" <dwlsalmeida@...il.com>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Jonathan Corbet <corbet@....net>
Subject: linux-next: manual merge of the fuse tree with Linus' tree

Hi all,

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

  Documentation/filesystems/index.rst

between commit:

  77ce1a47ebca ("docs: filesystems: add overlayfs to index.rst")

from Linus' tree and commit:

  8ab13bca428b ("Documentation: filesystems: convert fuse to RST")

from the fuse 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

Content of type "application/pgp-signature" skipped