Re: [PATCH 01/49] regulator: ab8500: Further populate initialisationregisters

From: Mark Brown
Date: Fri Feb 08 2013 - 05:55:47 EST

On Fri, Feb 08, 2013 at 08:20:50AM +0000, Lee Jones wrote:
> On Thu, 07 Feb 2013, Mark Brown wrote:

> > I tried to apply this but got conflicts - can you please check what's
> > going on with this vs my topic/ab8500 branch?

> It's almost certainly because you're trying to pull the patches in out
> of order. This _will_ end in conflicts. Any chance you can start from
> 01 and work your way though them. I will fixup any that you don't like
> on the fly.

Just following up on our IRC discussion I think that the issue here is
you're basing on -rc not on the topic branch - the patches are going in
pretty much in order, there's no meaningful reordering going on. I am
picking things from the start of the several unrelated topics that are
mixed in randomly in the series but there should be no overlap here.

If you just rebase off the topic branch while you do your fixups git
ought to drop the patches for you most of the time.

Attachment: signature.asc
Description: Digital signature