[GIT PULL] pxa: patches for next merge window

[Nicolas Pitre]

On Sun, 28 Feb 2010, Russell King - ARM Linux wrote:

> You've destroyed your original commits, so this calls into question my
> entire 'devel-stable' branch.
> 
> I've still not decided what to do about this.  I'll ask Linus to merge
> most of the 'devel' stuff without 'devel-stable' merged into mainline
> to move stuff forward - this means _no_ _one's_ git work will be merged
> through my tree, at least initially.
> 
> However, I'm putting 'devel-stable' on hold; I'll let the other ARM git
> maintainers discuss this and work out what they're going to do about
> this mess.  One solution is to destroy the 'devel-stable' branch in
> its entirety, and get everyone to resend all their pull requests.
> That's *not* nice.

What about simply ignoring Eric's latest pull request and have your 
'devel-stable' be merged by Linus as is?  Surely the earlier branch you 
merged from Eric wasn't that bad anyway, and Eric can certainly provide 
new commits on top later on to fix possible issues with that in order to 
bring his stuff to the same state as what he just asked you to pull.


Nicolas