From: Haavard Skinnemoen <haavard.skinnemoen@atmel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Woodhouse <dwmw2@infradead•org>,
linux-next@vger•kernel.org,
Hans-Christian Egtvedt <hcegtvedt@atmel•com>
Subject: Re: linux-next: mtd/avr32 merge conflict
Date: Thu, 12 Jun 2008 22:24:03 +0200 [thread overview]
Message-ID: <20080612222403.18755932@siona.local> (raw)
In-Reply-To: <20080612145538.0835c0b8.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2008-06-12 21:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-12 4:55 linux-next: mtd/avr32 merge conflict Stephen Rothwell
2008-06-12 20:24 ` Haavard Skinnemoen [this message]
2008-06-12 23:46 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080612222403.18755932@siona.local \
--to=haavard.skinnemoen@atmel$(echo .)com \
--cc=dwmw2@infradead$(echo .)org \
--cc=hcegtvedt@atmel$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox