* linux-next: mtd/avr32 merge conflict
@ 2008-06-12 4:55 Stephen Rothwell
2008-06-12 20:24 ` Haavard Skinnemoen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-12 4:55 UTC (permalink / raw)
To: David Woodhouse
Cc: linux-next, "Håvard Skinnemoen",
Hans-Christian Egtvedt
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi David,
Today's linux-next merge of the mtd tree got a trivial conflict in
include/asm-avr32/arch-at32ap/board.h between commit
f01fb51fc0e2b77c8bbf4d41adfd74c367173b02 ("avr32: Add PSIF platform
devices") from the avr32 tree and commit
62090a08aba579e6c69319fac4d4a1f806f26400 ("[MTD] [NAND] avr32: atmel_nand
platform code for AT32AP700x") from the mtd tree.
It was just a case of overlapping additions.
--
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* Re: linux-next: mtd/avr32 merge conflict
2008-06-12 4:55 linux-next: mtd/avr32 merge conflict Stephen Rothwell
@ 2008-06-12 20:24 ` Haavard Skinnemoen
2008-06-12 23:46 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Haavard Skinnemoen @ 2008-06-12 20:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Woodhouse, linux-next, Hans-Christian Egtvedt
Hi Stephen and David,
On Thu, 12 Jun 2008 14:55:38 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi David,
>
> Today's linux-next merge of the mtd tree got a trivial conflict in
> include/asm-avr32/arch-at32ap/board.h between commit
> f01fb51fc0e2b77c8bbf4d41adfd74c367173b02 ("avr32: Add PSIF platform
> devices") from the avr32 tree and commit
> 62090a08aba579e6c69319fac4d4a1f806f26400 ("[MTD] [NAND] avr32: atmel_nand
> platform code for AT32AP700x") from the mtd tree.
>
> It was just a case of overlapping additions.
I moved the at32_add_device_psif() prototype a bit up. I think that
took care of the conflict.
Haavard
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: mtd/avr32 merge conflict
2008-06-12 20:24 ` Haavard Skinnemoen
@ 2008-06-12 23:46 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-12 23:46 UTC (permalink / raw)
To: Haavard Skinnemoen; +Cc: David Woodhouse, linux-next, Hans-Christian Egtvedt
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
Hi Haavard,
On Thu, 12 Jun 2008 22:24:03 +0200 Haavard Skinnemoen <haavard.skinnemoen@atmel•com> wrote:
>
> On Thu, 12 Jun 2008 14:55:38 +1000
> Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> > Hi David,
> >
> > Today's linux-next merge of the mtd tree got a trivial conflict in
> > include/asm-avr32/arch-at32ap/board.h between commit
> > f01fb51fc0e2b77c8bbf4d41adfd74c367173b02 ("avr32: Add PSIF platform
> > devices") from the avr32 tree and commit
> > 62090a08aba579e6c69319fac4d4a1f806f26400 ("[MTD] [NAND] avr32: atmel_nand
> > platform code for AT32AP700x") from the mtd tree.
> >
> > It was just a case of overlapping additions.
>
> I moved the at32_add_device_psif() prototype a bit up. I think that
> took care of the conflict.
Thanks.
--
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-12 23:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-12 4:55 linux-next: mtd/avr32 merge conflict Stephen Rothwell
2008-06-12 20:24 ` Haavard Skinnemoen
2008-06-12 23:46 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox