On Thu, Sep 12, 2019 at 03:47:16PM +0200, Christoph Hellwig wrote: > 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? Done.