From: Benoit Cousson <bcousson@baylibre.com>
To: Tony Lindgren <tony@atomide.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [GIT PULL] ARM: OMAP: Device Tree for 3.13
Date: Fri, 11 Oct 2013 21:05:27 +0200 [thread overview]
Message-ID: <52584BF7.8060100@baylibre.com> (raw)
In-Reply-To: <20131011180324.GV29913@atomide.com>
Hi Tony,
On 11/10/2013 20:03, Tony Lindgren wrote:
> Hi Benoit,
>
> * Benoit Cousson <bcousson@baylibre.com> [131011 09:50]:
>> Add the minimal DTS support for DRA7xx based SoC core.
>> Add the initial support for N900 and gta04 phones.
>> Enable USB3 on OMAP5 evm board.
>> Add support for cryto accelerators
>> Add new IGEP AQUILA board
>> Add AM33XX EDMA support
>> Update HSUSB node to use the reset-gpios fmwk
>
> Looks good to me, but we're getting self-inflicted merge
> conflicts in two places now with Paul's hwmod changes,
> and my defconfig changes.
Damn!
> Can you please respin without the following two patches:
>
> 49bcd824c1c0db32fe4de0c1ba3ee36defdb11ca ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies
> 736c4bb159c793b00331261438deb982cbac3c03 ARM: OMAP5: hwmod: add missing ocp2scp hwmod data
>
> I can pick the two patches above and apply after pulling in
> Paul's branch first.
OK, no problem.
>
> However, if other branches are based on this, then we just
> need to deal with the merge conflicts, and there's no point
> in redoing your branch.
Considering the patches, I don't see any dependency with the other ones,
as soon as they are pulled before the DTS changes.
I'll do that ASAP and repost.
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.13
Date: Fri, 11 Oct 2013 21:05:27 +0200 [thread overview]
Message-ID: <52584BF7.8060100@baylibre.com> (raw)
In-Reply-To: <20131011180324.GV29913@atomide.com>
Hi Tony,
On 11/10/2013 20:03, Tony Lindgren wrote:
> Hi Benoit,
>
> * Benoit Cousson <bcousson@baylibre.com> [131011 09:50]:
>> Add the minimal DTS support for DRA7xx based SoC core.
>> Add the initial support for N900 and gta04 phones.
>> Enable USB3 on OMAP5 evm board.
>> Add support for cryto accelerators
>> Add new IGEP AQUILA board
>> Add AM33XX EDMA support
>> Update HSUSB node to use the reset-gpios fmwk
>
> Looks good to me, but we're getting self-inflicted merge
> conflicts in two places now with Paul's hwmod changes,
> and my defconfig changes.
Damn!
> Can you please respin without the following two patches:
>
> 49bcd824c1c0db32fe4de0c1ba3ee36defdb11ca ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies
> 736c4bb159c793b00331261438deb982cbac3c03 ARM: OMAP5: hwmod: add missing ocp2scp hwmod data
>
> I can pick the two patches above and apply after pulling in
> Paul's branch first.
OK, no problem.
>
> However, if other branches are based on this, then we just
> need to deal with the merge conflicts, and there's no point
> in redoing your branch.
Considering the patches, I don't see any dependency with the other ones,
as soon as they are pulled before the DTS changes.
I'll do that ASAP and repost.
Benoit
next prev parent reply other threads:[~2013-10-11 19:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 16:42 [GIT PULL] ARM: OMAP: Device Tree for 3.13 Benoit Cousson
2013-10-11 16:42 ` Benoit Cousson
2013-10-11 18:03 ` Tony Lindgren
2013-10-11 18:03 ` Tony Lindgren
2013-10-11 19:05 ` Benoit Cousson [this message]
2013-10-11 19:05 ` Benoit Cousson
2013-10-11 21:42 ` Tony Lindgren
2013-10-11 21:42 ` Tony Lindgren
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=52584BF7.8060100@baylibre.com \
--to=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--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.