archive mirror
 help / color / mirror / Atom feed
From: Richard Genoud <>
To: Stephen Rothwell <>
Cc: Olof Johansson <>, Arnd Bergmann <>,,,, Wenyou Yang <>,
	Mark Brown <>,
	Nicolas Ferre <>
Subject: Re: linux-next: manual merge of the arm-soc tree with the spi-mb tree
Date: Fri, 26 Apr 2013 09:21:36 +0200	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

2013/4/26 Stephen Rothwell <>:
> Hi all,
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/at91sam9x5.dtsi between commits d50f88a0c304 ("ARM:
> dts: add spi nodes for atmel SoC") and a68b728f7a21 ("ARM: dts: add
> pinctrl property for spi node for atmel SoC") from the spi-mb tree and
> commits e9a72ee81d58 ("ARM: at91: dt: at91sam9x5: add i2c pinctrl"),
> 463c9c7bf1f3 ("ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl") and
> b909c6c94462 ("ARM: at91/at91sam9x5: add RTC node") from the arm-soc tree.
> I fixed it up (hopefully - see below) and can carry the fix as necessary
> (no action is required).


It's all ok for me !



  reply	other threads:[~2013-04-26  7:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-26  7:06 linux-next: manual merge of the arm-soc tree with the spi-mb tree Stephen Rothwell
2013-04-26  7:21 ` Richard Genoud [this message]
2013-04-26  7:48 ` Yang, Wenyou
  -- strict thread matches above, loose matches on Subject: below --
2012-10-02  5:18 Stephen Rothwell
2012-10-02  5:13 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \

* 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).