From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: Re: [git pull] vfs.git; pile 1
Date: Mon, 23 Jul 2012 07:09:09 +0100 [thread overview]
Message-ID: <20120723060909.GE31729@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20120722202030.GB31729@ZenIV.linux.org.uk>
On Sun, Jul 22, 2012 at 09:20:30PM +0100, Al Viro wrote:
> Result: for-linus-2 + v3.5 and for-linus + v3.5 give identical trees,
> and for-linus-2 merges clean with nfs/nfs-for-3.6. Would you be OK
> with pulling that one? Again, my apologies to everyone involved ;-/
>
> If you are OK with pulling that one, the summary is unchanged, location is
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus-2
BTW, Stephen, could you confirm that vfs.git#for-linus-2 has no conflicts
with the rest of trees in linux-next? I've checked the lack of conflicts
with nfs.git and you haven't mentioned any other conflicts, so I hope
that this will do, but I haven't tried pulling and merging the rest of
the stuff in -next; not with the link I'm behind right now... ;-/
next prev parent reply other threads:[~2012-07-23 6:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-22 10:09 [git pull] vfs.git; pile 1 Al Viro
2012-07-22 17:34 ` Linus Torvalds
2012-07-22 20:20 ` Al Viro
2012-07-23 6:09 ` Al Viro [this message]
2012-07-23 6:49 ` Stephen Rothwell
2012-07-23 8:20 ` Boaz Harrosh
2012-07-23 9:03 ` Al Viro
2012-07-23 16:54 ` Boaz Harrosh
-- strict thread matches above, loose matches on Subject: below --
2014-08-11 17:05 [git pull] vfs.git " Al Viro
2014-10-12 23:23 Al Viro
2017-03-02 12:35 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=20120723060909.GE31729@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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.