From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch
Date: Mon, 1 Oct 2012 16:56:55 -0700 [thread overview]
Message-ID: <1349135827-24790-1-git-send-email-olof@lixom.net> (raw)
Hi Linus,
Here is the first batch of pull requests for arm-soc for this merge
window. Some of them are tiny, and we will probably start to combine
them into slightly larger misc branches in the future. I didn't do it
this time around since the dependencies between branches ended up quite
complex this time around.
We unfortunately have a somewhat conflict-heavy merge window in front
of us. The reason is a couple of substantial moves of header files and
Makefile contents on platforms. The shuffling is done to allow multiple
platforms to be built into the same kernel image, a goal that has
been worked towards for quite some time now and finally are bearing
fruit. We're starting out with just a few platforms but it's expected
that several more will be enabled for 3.8.
As usual I have described the conflicts in each pull request and how I
resolved them. I have also pushed up a temporary branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git merge-part1-resolved
that contains the merges as I have done them.
With that, here comes the first batch of updates. There will be a second
batch later on once these have been merged.
Thanks!
-Olof
next reply other threads:[~2012-10-01 23:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-01 23:56 Olof Johansson [this message]
2012-10-01 23:56 ` [GIT PULL 1/12] ARM: soc: non-critical bug fixes Olof Johansson
2012-10-01 23:56 ` [GIT PULL 2/12] ARM: soc: general cleanups Olof Johansson
2012-10-01 23:56 ` [GIT PULL 3/12] ARM: soc: MAINTAINERS updates Olof Johansson
2012-10-01 23:56 ` [GIT PULL 4/12] ARM: soc: soc-specific updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 5/12] ARM: soc: device tree updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 6/12] ARM: soc: cleanups, part 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 7/12] ARM: soc: soc-specific updates, take 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 8/12] ARM: soc: driver specific changes Olof Johansson
2012-10-01 23:57 ` [GIT PULL 9/12] ARM: soc: board specific updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 10/12] ARM: soc: device tree updates, take 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 11/12] ARM: soc: documentation updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 12/12] ARM: soc: multiplatform enablement Olof Johansson
2012-10-02 2:22 ` [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Linus Torvalds
2012-10-02 2:26 ` Linus Torvalds
2012-10-02 2:43 ` Olof Johansson
2012-10-02 2:34 ` Olof Johansson
2012-10-02 3:03 ` 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=1349135827-24790-1-git-send-email-olof@lixom.net \
--to=olof@lixom.net \
--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 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).