From: Benoit Cousson <bcousson@baylibre.com>
To: Olof Johansson <olof@lixom.net>
Cc: "khilman@linaro.org" <khilman@linaro.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
Tony Lindgren <tony@atomide.com>
Subject: Re: [GIT PULL] ARM: OMAP: Device Tree for 3.12 take #2
Date: Tue, 03 Sep 2013 22:53:11 +0200 [thread overview]
Message-ID: <52264C37.9050109@baylibre.com> (raw)
In-Reply-To: <CAOesGMgwRsEJaKb4-LF2SFO_nHT97EHrE1MSdXv4bE8Ja_OhDA@mail.gmail.com>
Hi Olof,
On 03/09/2013 17:06, Olof Johansson wrote:
> Benoit,
>
> On Fri, Aug 30, 2013 at 1:30 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>> Hi Kevin & Olof,
>>
>> Here is the updated version without the conflicting patch (ARM: dts: AM33XX: don't redefine OCP bus and device nodes) and with the signed tag.
>> There is still a small conflict with usb-next, but it is easily fixable, and already fixed by Stephen.
>
> Sorry, I wasn't able to get this pulled in before the merge window
> opened, so it'll unfortunately have to wait until 3.13. Please send a
> fresh pull request as soon as -rc1 is out.
Gosh :-(
That was just the update of the previous conflicting one. Did you remove
the older version as well?
> It looks like a few of these are fixes (at least from the patch
> topics), we'd of course be happy to take those.
OK, I'll extract the fixes for 3.12-rc.
Regards,
Benoit
WARNING: multiple messages have this Message-ID (diff)
From: bcousson@baylibre.com (Benoit Cousson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP: Device Tree for 3.12 take #2
Date: Tue, 03 Sep 2013 22:53:11 +0200 [thread overview]
Message-ID: <52264C37.9050109@baylibre.com> (raw)
In-Reply-To: <CAOesGMgwRsEJaKb4-LF2SFO_nHT97EHrE1MSdXv4bE8Ja_OhDA@mail.gmail.com>
Hi Olof,
On 03/09/2013 17:06, Olof Johansson wrote:
> Benoit,
>
> On Fri, Aug 30, 2013 at 1:30 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>> Hi Kevin & Olof,
>>
>> Here is the updated version without the conflicting patch (ARM: dts: AM33XX: don't redefine OCP bus and device nodes) and with the signed tag.
>> There is still a small conflict with usb-next, but it is easily fixable, and already fixed by Stephen.
>
> Sorry, I wasn't able to get this pulled in before the merge window
> opened, so it'll unfortunately have to wait until 3.13. Please send a
> fresh pull request as soon as -rc1 is out.
Gosh :-(
That was just the update of the previous conflicting one. Did you remove
the older version as well?
> It looks like a few of these are fixes (at least from the patch
> topics), we'd of course be happy to take those.
OK, I'll extract the fixes for 3.12-rc.
Regards,
Benoit
next prev parent reply other threads:[~2013-09-03 20:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-30 20:30 [GIT PULL] ARM: OMAP: Device Tree for 3.12 take #2 Benoit Cousson
2013-08-30 20:30 ` Benoit Cousson
2013-09-03 15:06 ` Olof Johansson
2013-09-03 15:06 ` Olof Johansson
2013-09-03 20:53 ` Benoit Cousson [this message]
2013-09-03 20:53 ` Benoit Cousson
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=52264C37.9050109@baylibre.com \
--to=bcousson@baylibre.com \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.