linux-kernel - Re: linux-next: manual merge of the configfs tree with the vfs-fixes 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190912134716.GA19681@lst.de>
Date:   Thu, 12 Sep 2019 15:47:16 +0200
From:   Christoph Hellwig <hch@....de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Christoph Hellwig <hch@....de>, Al Viro <viro@...IV.linux.org.uk>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the configfs tree with the
 vfs-fixes tree

On Thu, Sep 12, 2019 at 11:44:12PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the configfs tree got a conflict in:
> 
>   fs/configfs/symlink.c
> 
> between commit:
> 
>   e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()")
> 
> from the vfs-fixes tree and commit:

The configfs one has been rebased.  I also have another refactoring
after this one before the rest of Als patches, so you'll run into
more issues.

Al, can you drop the branch from your tree?