linux-kernel - linux-next: manual merge of the vfs 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: <20200401105535.275226a6@canb.auug.org.au>
Date:   Wed, 1 Apr 2020 10:55:35 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Namjae Jeon <namjae.jeon@...sung.com>
Subject: linux-next: manual merge of the vfs tree with Linus' tree

Hi all,

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

  drivers/staging/exfat/Kconfig

between commit:

  590a95e418d1 ("staging: exfat: remove staging version of exfat filesystem")

from Linus' tree and commit:

  1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

from the vfs tree.

I fixed it up (I just removed the file) 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