From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] GIC DT binding support
Date: Thu, 20 Oct 2011 09:34:08 -0500 [thread overview]
Message-ID: <4EA03160.1050304@gmail.com> (raw)
In-Reply-To: <201110201507.38722.arnd@arndb.de>
Arnd,
On 10/20/2011 08:07 AM, Arnd Bergmann wrote:
> On Friday 14 October 2011, Rob Herring wrote:
>> Please pull GIC device tree support. This is the first of 2 pull
>> requests. You can ignore this one if there are no other dependencies on
>> GIC DT support.
>>
>> This is based on rmk's for-next branch and v3.1-rc9. rc9 was needed for
>> this dependency:
>
> I don't see the for-next branch in the history. Do you mean it requires
> the for-next branch as well in order to actually build?
Probably because it is buried by rc9 commits:
git log v3.1-rc9..gic-dt
>
> Can you be more specific so I can watch for the dependencies to
> get upstream first?
>
I believe it conflicts with this commit in rmk/for-next:
commit b166bc3be08b744d2f4b14921a1efee14906b383
Author: Will Deacon <will.deacon@arm.com>
Date: Tue Aug 23 22:20:03 2011 +0100
ARM: 7061/1: gic: convert logical CPU numbers into physical numbers
And this one in rmk/devel-stable:
commit 254056f3b12563c11e6dbcfad2fbfce20a4f3302
Author: Colin Cross <ccross@android.com>
Date: Thu Feb 10 12:54:10 2011 -0800
ARM: gic: Use cpu pm notifiers to save gic state
BTW, Russell's for-next branch has been rebased. The conflict with the
1st commit is trivial, so I could rebase to merge of rmk/devel-stable
and v3.1-rc9.
I still need things from for-next for highbank. So perhaps I should send
a pull request after Russell's tree goes in?
Rob
next prev parent reply other threads:[~2011-10-20 14:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 3:01 [GIT PULL] GIC DT binding support Rob Herring
2011-10-14 3:18 ` Shawn Guo
2011-10-18 9:53 ` Domenico Andreoli
2011-10-18 14:50 ` Rob Herring
2011-10-18 14:58 ` Domenico Andreoli
2011-10-18 15:10 ` Rob Herring
2011-10-20 12:48 ` Shawn Guo
2011-10-20 12:50 ` Russell King - ARM Linux
2011-10-20 13:07 ` Arnd Bergmann
2011-10-20 14:34 ` Rob Herring [this message]
2011-10-20 16:12 ` Arnd Bergmann
2011-10-20 17:09 ` Rob Herring
2011-10-20 18:56 ` Russell King - ARM Linux
2011-10-20 21:04 ` Arnd Bergmann
2011-10-21 18:33 ` Russell King - ARM Linux
2011-10-21 19:31 ` Arnd Bergmann
2011-10-21 22:25 ` Russell King - ARM Linux
2011-10-20 21:08 ` Rob Herring
2011-10-20 21:15 ` Russell King - ARM Linux
2011-10-20 21:17 ` Arnd Bergmann
2011-10-21 8:51 ` Arnd Bergmann
2011-10-21 20:09 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2011-10-24 21:38 Rob Herring
2011-10-28 21:17 ` Rob Herring
2011-10-30 22:39 ` Arnd Bergmann
2011-10-31 0:31 ` Arnd Bergmann
2011-10-31 1:45 ` Rob Herring
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=4EA03160.1050304@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.