From: Linus Torvalds <torvalds@linux-foundation.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
FUJITA Tomonori <tomof@acm.org>
Subject: Re: [git pull] Please pull powerpc.git next branch
Date: Tue, 15 Sep 2009 09:53:08 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0909150943580.4950@localhost.localdomain> (raw)
In-Reply-To: <1252999835.8375.205.camel@pasglop>
On Tue, 15 Sep 2009, Benjamin Herrenschmidt wrote:
>
> So I don't know at this stage how to generate a "clean" pull request ...
It's rare, for but future reference, what you can do is to just do a
merge in a temporary branch, and get it that way.
'git shortlog' should have worked, though. It's only the 'diff' that is
based on the direct difference between two end-points, rather than based
on working with intersections of sets of commits.
Maybe the scripts use 'origin...master' or something for the shortlog, and
then the merge-base thing will confuse it? Haven't looked.
> In any case, the tree is still there waiting for you to pull. It seems
> to merge cleanly tonight though I haven't yet got a chance to test the
> result much.
It got a conflict with the AGP merge, but I fixed it up in what _seemed_
to be the obvious manner. But somebody should check out the resulting
drivers/char/agp/uninorth-agp.c file.
Linus
next prev parent reply other threads:[~2009-09-15 16:53 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-11 7:17 [git pull] Please pull powerpc.git next branch Benjamin Herrenschmidt
2009-09-15 7:30 ` Benjamin Herrenschmidt
2009-09-15 16:53 ` Linus Torvalds [this message]
2009-09-15 21:51 ` Benjamin Herrenschmidt
2009-09-15 22:29 ` Michel Dänzer
2009-09-15 21:09 ` Geoff Levand
2009-09-15 23:57 ` Michael Ellerman
-- strict thread matches above, loose matches on Subject: below --
2014-08-14 6:16 Benjamin Herrenschmidt
2014-08-14 6:18 ` Benjamin Herrenschmidt
2014-08-07 5:08 Benjamin Herrenschmidt
2014-06-13 0:55 Benjamin Herrenschmidt
2014-06-13 0:56 ` Benjamin Herrenschmidt
2014-06-07 4:34 Benjamin Herrenschmidt
2014-04-01 23:34 Benjamin Herrenschmidt
2014-01-30 2:55 Benjamin Herrenschmidt
2014-01-28 4:35 Benjamin Herrenschmidt
2014-01-28 9:16 ` Olaf Hering
2014-01-28 15:03 ` Olaf Hering
2014-01-28 20:19 ` Benjamin Herrenschmidt
2014-01-29 2:29 ` Alistair Popple
2014-01-29 8:41 ` Olaf Hering
2014-02-03 3:00 ` Michael Ellerman
2013-11-12 0:31 Benjamin Herrenschmidt
2013-09-06 2:24 Benjamin Herrenschmidt
2013-09-06 17:56 ` Linus Torvalds
2013-09-07 7:12 ` Benjamin Herrenschmidt
2013-07-03 22:43 Benjamin Herrenschmidt
2013-05-02 7:35 Benjamin Herrenschmidt
2013-04-29 19:56 Kumar Gala
2013-02-23 17:45 Benjamin Herrenschmidt
2013-02-19 17:18 Kumar Gala
2012-12-14 20:44 Benjamin Herrenschmidt
2012-12-16 22:24 ` Benjamin Herrenschmidt
2012-12-17 8:30 ` Anatolij Gustschin
2012-12-17 10:06 ` Benjamin Herrenschmidt
2012-12-17 10:15 ` Anatolij Gustschin
2012-12-17 23:31 ` Benjamin Herrenschmidt
2012-12-18 18:02 ` Linus Torvalds
2012-12-19 23:10 ` Benjamin Herrenschmidt
2012-11-25 13:27 Kumar Gala
2012-11-25 22:26 ` Benjamin Herrenschmidt
2012-10-03 13:25 Kumar Gala
2012-09-19 15:08 Kumar Gala
2012-09-13 18:21 Kumar Gala
2012-07-23 4:46 Benjamin Herrenschmidt
2012-07-12 22:00 Kumar Gala
2012-05-23 3:40 Benjamin Herrenschmidt
2012-03-29 20:44 Kumar Gala
2012-03-29 21:47 ` Tabi Timur-B04825
2012-04-02 15:25 ` Tabi Timur-B04825
2012-03-28 3:31 Benjamin Herrenschmidt
2012-03-22 0:46 Benjamin Herrenschmidt
2012-03-22 2:02 ` Linus Torvalds
2012-03-22 2:44 ` Benjamin Herrenschmidt
2012-03-22 3:01 ` Tony Breeds
2012-03-22 4:13 ` Kyle Moffett
2012-03-22 5:33 ` Benjamin Herrenschmidt
2012-03-16 21:30 Kumar Gala
2012-01-06 3:42 Benjamin Herrenschmidt
2012-01-04 22:06 Kumar Gala
2012-01-08 23:58 ` Michael Neuling
2011-11-24 8:39 Kumar Gala
2011-11-06 23:35 Benjamin Herrenschmidt
2011-11-03 18:27 Kumar Gala
2011-07-26 4:17 Benjamin Herrenschmidt
2011-07-25 14:08 [GIT PULL] " Kumar Gala
2011-07-08 12:58 [git pull] " Kumar Gala
2011-06-23 10:29 Kumar Gala
2011-05-20 3:31 [GIT PULL] " Kumar Gala
2011-05-20 4:38 ` Kumar Gala
2011-03-18 5:44 [git pull] " Benjamin Herrenschmidt
2011-03-18 13:34 ` Linus Torvalds
2011-03-18 21:48 ` Benjamin Herrenschmidt
2011-03-18 23:48 ` Hollis Blanchard
2011-03-15 21:04 Kumar Gala
2011-01-13 0:07 Kumar Gala
2010-10-22 3:51 Benjamin Herrenschmidt
2010-10-22 4:23 ` Linus Torvalds
2010-10-13 22:08 Kumar Gala
2010-10-14 1:02 ` Benjamin Herrenschmidt
2010-08-09 4:11 Benjamin Herrenschmidt
2010-08-09 4:39 ` Benjamin Herrenschmidt
2010-08-09 5:18 ` Grant Likely
2010-08-09 11:25 ` Benjamin Herrenschmidt
2018-06-19 22:58 ` Linus Torvalds
2018-06-20 0:02 ` Benjamin Herrenschmidt
2018-06-20 10:31 ` Jiri Kosina
2010-08-05 1:46 Benjamin Herrenschmidt
2010-08-04 22:35 Kumar Gala
2010-06-15 6:29 Benjamin Herrenschmidt
2010-05-25 2:38 Kumar Gala
2010-05-25 10:58 ` Josh Boyer
2010-05-21 9:11 Benjamin Herrenschmidt
2010-05-21 10:22 ` Josh Boyer
2010-05-21 12:42 ` Benjamin Herrenschmidt
2010-05-26 12:38 ` Josh Boyer
2010-05-21 10:37 ` Anton Vorontsov
2010-05-21 13:04 ` Wolfram Sang
2010-05-21 22:38 ` Benjamin Herrenschmidt
2010-02-27 3:56 Benjamin Herrenschmidt
2010-02-18 4:05 Kumar Gala
2009-12-15 20:20 Kumar Gala
2009-12-12 21:51 Benjamin Herrenschmidt
2009-01-08 5:39 Benjamin Herrenschmidt
2008-12-29 0:05 Paul Mackerras
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=alpine.LFD.2.01.0909150943580.4950@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mingo@elte.hu \
--cc=tomof@acm.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).