pxa-devel back-merge / cherry pick request

[Russell King - ARM Linux]

On Mon, May 31, 2010 at 09:25:07PM +0800, Eric Miao wrote:
> On Mon, May 31, 2010 at 7:48 PM, Daniel Mack <daniel at caiaq.de> wrote:
> > Hi Eric,
> >
> > Is there any plans to merge Linus' tree into your pxa-devel any time
> > soon? I'm asking because I have one patch pending which depends on
> >
> >  a3bcbbee ("pda_power: Add function callbacks for suspend and resume")
> >
> > upstream. Alternatively, could you cherry-pick this one commit?
> >
> 
> 'devel' branch rebased and pushed. Normally I rebase before sending
> git pull request to Russell.

It's best to avoid rebasing altogether unless there is a good reason
to do so.

If you want to make a decision about whether to rebase, one way to do
it is to create a test branch/tree, and try merging your selected
rebase point in - if it conflicts then you know when the original
branch is merged it'll have problems.