From: Jens Axboe <jens.axboe@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tejun Heo <tj@kernel.org>, Steven Rostedt <srostedt@redhat.com>,
Li Zefan <lizf@cn.fujitsu.com>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] first block round for 2.6.31
Date: Thu, 11 Jun 2009 22:04:10 +0200 [thread overview]
Message-ID: <20090611200410.GA11363@kernel.dk> (raw)
In-Reply-To: <alpine.LFD.2.01.0906111221391.3573@localhost.localdomain>
On Thu, Jun 11 2009, Linus Torvalds wrote:
>
>
> On Thu, 11 Jun 2009, Jens Axboe wrote:
> >
> > I pulled from his tree, don't think I ever rebased it.
>
> I'm pretty sure you did. That's why
> (a) you're the committer (because you are)
> (b) the commits aren't the same when I pull, even though the diffs are.
>
> Anyway, it's ok to take an occational patch from another tree, but then it
> needs to be signed off (and no faking of committer data, please) as a
> cherry-pick, not the way you did it.
I just looked up the offending commits, and you are right. I must have
rebased early on, after having pull some of the patches from Tejun. My
bad, wont repeat!
--
Jens Axboe
next prev parent reply other threads:[~2009-06-11 20:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-11 11:13 Jens Axboe
2009-06-11 18:18 ` Linus Torvalds
2009-06-11 18:26 ` Jens Axboe
2009-06-11 18:42 ` Linus Torvalds
2009-06-11 18:52 ` Jens Axboe
2009-06-11 19:23 ` Linus Torvalds
2009-06-11 20:04 ` Jens Axboe [this message]
2009-06-11 19:58 ` Diego Calleja
2009-06-11 20:05 ` Linus Torvalds
2009-06-12 6:48 ` Borislav Petkov
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=20090611200410.GA11363@kernel.dk \
--to=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=srostedt@redhat.com \
--cc=tj@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
Powered by JetHome