From: Al Viro <viro@zeniv.linux.org.uk>
To: Christoph Hellwig <hch@lst.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the configfs tree with the vfs-fixes tree
Date: Fri, 13 Sep 2019 22:58:07 +0100 [thread overview]
Message-ID: <20190913215807.GP1131@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20190912134716.GA19681@lst.de>
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.
prev parent reply other threads:[~2019-09-13 21:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 13:44 linux-next: manual merge of the configfs tree with the vfs-fixes tree Stephen Rothwell
2019-09-12 13:47 ` Christoph Hellwig
2019-09-13 21:58 ` Al Viro [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190913215807.GP1131@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).