lkml.org 
[lkml]   [2009]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [git pull] Please pull powerpc.git next branch


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


\
 
 \ /
  Last update: 2009-10-18 23:28    [W:0.067 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site