linux-next: arm/mer-current merge conflict

linux-next: arm/mer-current merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-pxa/tosa.c between commit
0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 ("[ARM] pxa: fix tosa.c build
error") from the arm-current tree and commit
a37cba9e5315bb57e8eb135e401ba35e4b2338ac ("[ARM] 5048/2: Clean up tosa
and spitz resetting") from the arm tree.  I used the latter since the
former's commit message implied that this was the right fix.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: arm/mer-current merge conflict

[Russell King]

On Tue, Jun 03, 2008 at 02:04:21PM +1000, Stephen Rothwell wrote:
> Hi Russell,
> 
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-pxa/tosa.c between commit
> 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 ("[ARM] pxa: fix tosa.c build
> error") from the arm-current tree and commit
> a37cba9e5315bb57e8eb135e401ba35e4b2338ac ("[ARM] 5048/2: Clean up tosa
> and spitz resetting") from the arm tree.  I used the latter since the
> former's commit message implied that this was the right fix.

Yes, I'm aware of there being two fixes in my tree for that.  One is
the fix suitable for -rc kernels, the other is the proper fix, which
has a higher impact.

The merge conflict will be resolved probably around merge window time -
I hope this doesn't cause you too much of a problem?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: linux-next: arm/mer-current merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

Hi Russell,

On Fri, 6 Jun 2008 11:10:12 +0100 Russell King <rmk@arm.linux.org.uk> wrote:
>
> Yes, I'm aware of there being two fixes in my tree for that.  One is
> the fix suitable for -rc kernels, the other is the proper fix, which
> has a higher impact.

Which is fair enough.

> The merge conflict will be resolved probably around merge window time -
> I hope this doesn't cause you too much of a problem?

Once I have the correct resolution, "git rerere" remembers and reapplies
it for me automatically, so its not much of a problem.

Now that the -rc fix has gone into Linus' tree, I assume you will
rebase/merge with his tree at some point at which time the conflict will
vanish for me.  No hurry.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]