[lkml]   [2019]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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?

 \ /
  Last update: 2019-09-12 15:48    [W:0.070 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site