From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Jamie Iles <jamie@jamieiles.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Thu, 24 Nov 2011 11:47:36 +0100 [thread overview]
Message-ID: <4ECE20C8.70400@atmel.com> (raw)
In-Reply-To: <20111124095603.GA5048@totoro>
On 11/24/2011 10:56 AM, Jamie Iles :
> Hi Stephen,
>
> On Thu, Nov 24, 2011 at 12:16:11PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the at91 tree got conflicts in
>> arch/arm/mach-at91/board-cap9adk.c, arch/arm/mach-at91/board-cpu9krea.c,
>> arch/arm/mach-at91/board-cpuat91.c,
>> arch/arm/mach-at91/board-snapper9260.c and
>> arch/arm/mach-at91/include/mach/board.h between commit 84e0cdb0a262
>> ("macb: unify at91 and avr32 platform data") from the arm-soc tree and
>> commit 1509f4847dd1 ("at91/boards: use -EINVAL for invalid gpio") from
>> the at91 tree.
>>
>> I fixed them up (see below) and can carry the fix as necessary.
>>
>> However, it looks to me that struct macb_platform_data (in
>> include/linux/platform_data/macb.h) will need its phy_irq_pin members
>> changed to int as well (which may have other consequences).
>
> That looks correct to me. I've just posted a patch to convert
> phy_irq_pin to an int and from inspection that shouldn't break anything
> by itself.
Good, I will Acknowledge it.
> The macb driver doesn't currently use the phy_irq_pin member, but the
> at91_ether driver does and that compares to 0 for no IRQ so the
> assignment of -EINVAL _could_.
Yes indeed, I have a patch to address that and I send it now. However, I
guess that this will go on top of Jean-Christophe's gpio patch series.
Best regards,
--
Nicolas Ferre
next prev parent reply other threads:[~2011-11-24 10:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 1:16 linux-next: manual merge of the at91 tree with the arm-soc tree Stephen Rothwell
2011-11-24 9:56 ` Jamie Iles
2011-11-24 10:47 ` Nicolas Ferre [this message]
2015-05-20 0:08 Stephen Rothwell
2015-05-20 7:41 ` Nicolas Ferre
2015-07-30 22:38 Stephen Rothwell
2015-07-31 7:09 ` Nicolas Ferre
2017-04-19 22:38 Stephen Rothwell
2017-04-20 14:50 ` Nicolas.Ferre
2017-06-04 23:48 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=4ECE20C8.70400@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=arnd@arndb.de \
--cc=jamie@jamieiles.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).