From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [git pull] vfs.git
Date: Sun, 20 Mar 2016 01:59:47 +0000 [thread overview]
Message-ID: <20160320015947.GA17997@ZenIV.linux.org.uk> (raw)
In-Reply-To: <CA+55aFyO_HXDqo7Lh_OSUJJXWdQc4ccOFeky31r+QwUsyN1bDg@mail.gmail.com>
On Sat, Mar 19, 2016 at 06:55:21PM -0700, Linus Torvalds wrote:
> On Sat, Mar 19, 2016 at 6:44 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> > Preparations of parallel lookups (the remaining main obstacle is the
> > need to move security_d_instantiate(); once that becomes safe, the rest will
> > be a matter of rather short series local to fs/*.c) + preadv2/pwritev2 series
> > from Christoph + assorted fixes.
>
> So this:
>
> > Al Viro:
> > replace d_add_unique() with saner primitive
>
> ends up conflicting with commit d9dfd8d74168 ("NFSv4: Fix a dentry
> leak on alias use").
>
> >From what I can tell, your version doesn't have the leak issue, so my
> merge resolution is to just take your new code as-is, but I'd ask you
> to double-check my logic.
>
> (I haven't pushed out the merge yet, it's still going through my build
> test. Soon, but I guess you can just take a look at that dentry leak
> commit regardless).
It does contain an equivalent of the leak fix, and yes, resolution should
be "take the variant from vfs.git in the area of conflict".
In fact, I was just pondering whether to send a followup describing the
conflict resolution (== take the variant from vfs.git in the area of
conflict) or leave it be as too trivial. Should've sent...
next prev parent reply other threads:[~2016-03-20 1:59 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 1:44 [git pull] vfs.git Al Viro
2016-03-20 1:55 ` Linus Torvalds
2016-03-20 1:59 ` Al Viro [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-17 5:55 Al Viro
2016-11-11 6:05 Al Viro
2016-11-11 17:25 ` Linus Torvalds
2016-11-11 18:06 ` Ilya Dryomov
2016-11-12 3:36 ` Yan, Zheng
2016-10-11 3:07 Al Viro
2016-05-16 3:32 Al Viro
2016-05-16 15:43 ` Linus Torvalds
2016-05-17 6:27 ` Al Viro
2016-05-17 18:27 ` Linus Torvalds
2016-05-17 20:11 ` Al Viro
2015-04-24 20:40 Al Viro
2014-12-10 19:13 [GIT PULL] vfs.git Al Viro
2014-12-11 16:18 ` Miklos Szeredi
2014-12-11 18:06 ` Al Viro
2014-12-11 18:34 ` Al Viro
2014-11-05 13:57 [git pull] vfs.git Al Viro
2014-11-02 5:58 Al Viro
2014-10-26 3:04 Al Viro
2014-05-28 6:38 Al Viro
2014-04-12 12:40 Al Viro
2014-04-13 18:53 ` Geert Uytterhoeven
2013-11-11 16:30 Al Viro
2013-11-13 14:52 ` J. Bruce Fields
2013-06-15 3:34 Al Viro
2012-12-21 0:21 Al Viro
2012-06-01 16:56 Al Viro
2012-06-01 17:38 ` Linus Torvalds
2012-06-01 17:38 ` Linus Torvalds
2012-06-01 17:48 ` Al Viro
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=20160320015947.GA17997@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.