From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: olof@lixom.net, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, arm@kernel.org
Subject: [GIT PULL 0/5] ARM: arm-soc: First batch of updates for 3.8
Date: Wed, 12 Dec 2012 08:39:42 -0800 [thread overview]
Message-ID: <20121212163942.GA16036@quad.lixom.net> (raw)
Hi Linus,
Here is the first set of pull requests for arm-soc for this merge window.
Unfortunately we seem to have quite a few of little nagging merge conflicts for
this release. There's been some bugfixes upstream that conflicted with cleanups
and refactorings, and there's been a lot of header file moves that resulted in
include-section conflicts.
I've documented my proposed resolution in each pull request, and as usual
I have also pushed up my resulting merge as <branch>-resolved, in case you want
to diff.
There's only one gotcha that I am aware of, and that is for the 'cleanup'
branch, where a build break will be introduced if you don't fixup a
function name rename/conflict that isn't detected by git since the new
code was added with the old name in one of the branches. Not a big deal
if you miss it, we'll submit a patch to fix it up in that case.
I've got more to come, but wanted to break it up in a couple of batches. More
details in each pull request.
Thanks!
-Olof
next reply other threads:[~2012-12-12 16:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 16:39 Olof Johansson [this message]
2012-12-12 16:40 ` [GIT PULL 1/5] ARM: arm-soc: Non-critical bug fixes Olof Johansson
2012-12-12 16:41 ` [GIT PULL 2/5] ARM: arm-soc: Header cleanups Olof Johansson
2012-12-12 16:41 ` [GIT PULL 3/5] ARM: arm-soc: Cleanups on various subarchitectures Olof Johansson
2012-12-12 16:42 ` [GIT PULL 4/5] ARM: arm-soc: SoC updates for 3.8 Olof Johansson
2012-12-12 16:42 ` [GIT PULL 5/5] ARM: arm-soc: Board " Olof Johansson
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=20121212163942.GA16036@quad.lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®