From: Linus Torvalds <torvalds@linux-foundation.org>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [git pull] vfs pile 3
Date: Sun, 7 Aug 2016 10:00:29 -0400 [thread overview]
Message-ID: <CA+55aFxLUVB5x0Sd8n8L45G7jOGotkRL7a_CtzP=SxE9CB27Yg@mail.gmail.com> (raw)
In-Reply-To: <20160807034627.GN2356@ZenIV.linux.org.uk>
On Sat, Aug 6, 2016 at 11:46 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> I went for the second variant (backmerge), but if you prefer the third one,
> just pull #for-linus-2 and I'll send a separate pull request for the last
> commit. Or just cherry-pick that last commit from #for-linus after having
> pulled #for-linus-2.
Please don't do back-merges to avoid conflicts. I'd *much* rather just
get the conflict. Especially when it's that trivial.
Linus
next prev parent reply other threads:[~2016-08-07 14:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-07 3:46 [git pull] vfs pile 3 Al Viro
2016-08-07 14:00 ` Linus Torvalds [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-04 1:12 [git pull] vfs, " Al Viro
2016-12-23 0:03 [git pull] vfs " Al Viro
2016-12-23 11:44 ` Al Viro
2012-10-13 0:20 Al Viro
2012-10-13 7:20 ` Marco Stornelli
2012-10-13 7:51 ` Al Viro
2012-10-13 7:52 ` Marco Stornelli
2012-10-13 15:48 ` Christoph Hellwig
2012-10-13 16:01 ` Al Viro
2012-10-13 16:04 ` Christoph Hellwig
2012-10-13 17:07 ` Al Viro
2012-10-14 9:59 ` Marco Stornelli
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='CA+55aFxLUVB5x0Sd8n8L45G7jOGotkRL7a_CtzP=SxE9CB27Yg@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).