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
prev parent reply other threads:[~2013-09-03 20:53 UTC|newest]
Thread overview: 3+ 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-09-03 15:06 ` Olof Johansson
2013-09-03 20:53 ` Benoit Cousson [this message]
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$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/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