* linux-next: arm/mer-current merge conflict
@ 2008-06-03 4:04 Stephen Rothwell
2008-06-06 10:10 ` Russell King
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-03 4:04 UTC (permalink / raw)
To: Russell King; +Cc: linux-next, Dmitry Baryshkov
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: arm/mer-current merge conflict
2008-06-03 4:04 linux-next: arm/mer-current merge conflict Stephen Rothwell
@ 2008-06-06 10:10 ` Russell King
2008-06-06 11:19 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Russell King @ 2008-06-06 10:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Dmitry Baryshkov
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:
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: arm/mer-current merge conflict
2008-06-06 10:10 ` Russell King
@ 2008-06-06 11:19 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-06 11:19 UTC (permalink / raw)
To: Russell King; +Cc: linux-next, Dmitry Baryshkov
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-06 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-03 4:04 linux-next: arm/mer-current merge conflict Stephen Rothwell
2008-06-06 10:10 ` Russell King
2008-06-06 11:19 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox