linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Eric Paris <eparis@redhat.com>, linux-kernel@vger.kernel.org
Subject: Re: [git pull] aush^H^Hdit queue
Date: Wed, 18 Jan 2012 00:38:40 +0000	[thread overview]
Message-ID: <20120118003840.GT23916@ZenIV.linux.org.uk> (raw)
In-Reply-To: <CA+55aFw_9Wm=qUH+39wb7Xq5KFTZZ4TqgkwMksrD_Q8G-uO3jg@mail.gmail.com>

On Tue, Jan 17, 2012 at 04:21:11PM -0800, Linus Torvalds wrote:
> On Tue, Jan 17, 2012 at 1:34 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> > ? ? ? ?By all rights it's Eric's stuff; I hadn't got around to resurrecting
> > audit.git until the end of December and this is what was in his tree (minus
> > a couple of things obsoleted by Miklos' "fsnotify: don't BUG in
> > fsnotify_destroy_mark()"). ?Please, pull from
> > git://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.git for-linus
> 
> Ugh.
> 
> You have an extra colon there in that git tree address. Please fix your script.

*blink*  Ah, I see...  That's not a script, actually - that's cut'n'paste
from .git/config, where it's in the form "gitolite@ra.kernel.org:/pub/scm/..."
Normally cut'n'paste starts at slash, this time I got lazy and blindly hit
it from ".kernel"...

Anyway, that should've been a part of script.  Fixed...

> But even more annoyingly, this is from the "help text" for one of the
> new options:
 
>   The config option toggles if a task setting it's loginuid requires

*cringe*

Missed that one (and normally I do hunt for typos in commit messaged when
applying).  What do you prefer - fix on top of the branch or --amend to
commit in question + cherry-pick of the rest on top of amended?  Alternatively,
that could be --amend'ed in the merge commit...

  reply	other threads:[~2012-01-18  0:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-17 21:34 [git pull] aush^H^Hdit queue Al Viro
2012-01-18  0:21 ` Linus Torvalds
2012-01-18  0:38   ` Al Viro [this message]
2012-01-18  0:44     ` Linus Torvalds
2012-01-18  0:45     ` Al Viro
2012-01-18  0:47       ` 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=20120118003840.GT23916@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=eparis@redhat.com \
    --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 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).