Subject: Re: linux-next: mtd/avr32 merge conflict

From: Haavard Skinnemoen <[email-masked]>
Date: Thu, 12 Jun 2008 22:24:03 +0200

Hi Stephen and David,

On Thu, 12 Jun 2008 14:55:38 +1000
Stephen Rothwell <[email-masked]> 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