Re: [git pull] x86: declaration fixes - ver2
From: Ingo Molnar
Date: Wed Jul 23 2008 - 03:32:58 EST
* Jaswinder Singh <jaswinder@xxxxxxxxxxxxx> wrote:
> Hello Ingo,
> Here are updated patches for x86-tip.
> The following changes since commit a099a9b18ab434594bb01ed920e8c58574203fa9:
> Ingo Molnar (1):
> Merge branch 'out-of-tree'
looks good, but could you please switch over the changes to be based on
the "upstream" topic branch of your patches, i.e. to tip/x86/prototypes?
You can do it the following way:
git checkout master
git merge tip/master # get latest
git checkout -b x86/prototypes-for-tip # new pull branch
git rebase --onto tip/x86/prototypes tip/master # switch
In theory this should run just fine without any conflicts or manual
If that rebase command ran fine, double-check the end result by looking
at the output of:
git log tip/x86/prototypes..x86/prototypes-for-tip
... then resend the pull request for the x86/prototypes branch you have,
by doing something like:
git-request-pull tip/x86/prototypes git://git.infradead.org/users/jaswinder/linux-2.6-tip.git x86/prototypes-for-tip
The reason for not basing your branch on tip/master is that we want to
keep x86/protypes topic a "pure" topic that is mergable without waiting
for other topics - without mixing it with all other topics that are
integrated into tip/master.
And note that x86/prototypes-for-tip is a by-line branch that you should
not touch after sending the pull request (so that what i pull matches up
to the summary in the email you send) - you can still evolve your master
branch with other work, create other branches, etc.
Let me know if there's any Git hickup.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/