From: Linus Torvalds <torvalds@linux-foundation.org>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [git pull] vfs.git
Date: Fri, 1 Jun 2012 10:38:53 -0700 [thread overview]
Message-ID: <CA+55aFxcFKxY8f1-mQz68FX3Uax-i-FQ3Wj9=z+bUn0KxTCbHA@mail.gmail.com> (raw)
In-Reply-To: <20120601165614.GJ30000@ZenIV.linux.org.uk>
On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> There's a trivial conflict in Documentation/filesystems/vfs.txt - two
> method prototypes added, one in mainline, one here. With the obvious
> conflict resolution...
Actually, it's one removed in mainline, one added by your pull.
What I'd *really* like to see is a kind of summary of what this pull
does, though. Please? That way I can make the merge messages be a
whole lot more informative.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-06-01 17:39 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-01 16:56 [git pull] vfs.git Al Viro
2012-06-01 17:38 ` Linus Torvalds [this message]
2012-06-01 17:48 ` Al Viro
2012-12-21 0:21 Al Viro
2013-06-15 3:34 Al Viro
2013-11-11 16:30 Al Viro
2013-11-13 14:52 ` J. Bruce Fields
2014-04-12 12:40 Al Viro
2014-04-13 18:53 ` Geert Uytterhoeven
2014-05-28 6:38 Al Viro
2014-10-26 3:04 Al Viro
2014-11-02 5:58 Al Viro
2014-11-05 13:57 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
2015-04-24 20:40 [git pull] vfs.git Al Viro
2016-03-20 1:44 Al Viro
2016-03-20 1:55 ` Linus Torvalds
2016-03-20 1:59 ` 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
2016-10-11 3:07 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-11-17 5:55 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='CA+55aFxcFKxY8f1-mQz68FX3Uax-i-FQ3Wj9=z+bUn0KxTCbHA@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).