From: Al Viro <viro@ZenIV.linux.org.uk>
To: Dongsheng Song <dongsheng.song@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Artem Bityutskiy <dedekind1@gmail.com>
Subject: Re: Linux 3.6-rc1
Date: Sat, 4 Aug 2012 09:19:07 +0100 [thread overview]
Message-ID: <20120804081907.GK23464@ZenIV.linux.org.uk> (raw)
In-Reply-To: <CAE8XmWphq=XG3aSHWuwcnkKCnyeZ7dGzd0fjpJCKx90bvEKBQw@mail.gmail.com>
On Sat, Aug 04, 2012 at 03:51:01PM +0800, Dongsheng Song wrote:
> On Sat, Aug 4, 2012 at 2:19 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> >
> > Documentation/sysctl/vm.txt.rej | 21 +++++++++++++
>
> vm.txt.rej ???
Grrr... git add Documentation/sysctl/ during conflict-resolving in git am, having
forgotten that this turd wasn't removed in process, then a bit of blindness when
generating and pasting the diffstat ;-/ Thanks for spotting.
I've put the branch sans that idiocy in the same tree; for-linus-2 (basically,
branched off at the commit introducing that, then git rm Documentation/sysctl/*.rej
to get rid of that sucker, git commit --amend, git cherry-pick <branchpoint>..for-linus)
Same shortlog, same diffstat sans that idiocy... Alternatively, it could be fixed
up upon merge, if Linus is really dead set against any rebases (same git rm/git commit --amend
right after git merge or git pull, whatever Linus uses).
Sorry about that ;-/
next prev parent reply other threads:[~2012-08-04 8:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 1:17 Linux 3.6-rc1 Linus Torvalds
2012-08-03 6:47 ` Artem Bityutskiy
2012-08-03 20:23 ` Linus Torvalds
2012-08-04 4:46 ` Al Viro
2012-08-04 5:38 ` Artem Bityutskiy
2012-08-04 6:19 ` Al Viro
2012-08-04 7:51 ` Dongsheng Song
2012-08-04 8:19 ` Al Viro [this message]
2012-08-04 5:43 ` Artem Bityutskiy
2012-08-03 19:01 ` Nicholas A. Bellinger
2012-08-04 0:02 ` [PATCH] pstore: fix printk format warning Randy Dunlap
2012-08-04 1:15 ` Anton Vorontsov
2012-08-04 1:32 ` Randy Dunlap
2012-08-04 1:35 ` Kees Cook
2012-08-06 16:07 ` Luck, Tony
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=20120804081907.GK23464@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=dedekind1@gmail.com \
--cc=dongsheng.song@gmail.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