[GIT PULL 0/5] ARM: arm-soc: First batch of updates for 3.8

* [GIT PULL 0/5] ARM: arm-soc: First batch of updates for 3.8
@ 2012-12-12 16:39 Olof Johansson
  2012-12-12 16:40 ` [GIT PULL 1/5] ARM: arm-soc: Non-critical bug fixes Olof Johansson
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-12 16:39 UTC (permalink / raw)
  To: torvalds; +Cc: olof, linux-arm-kernel, linux-kernel, arm

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

^ permalink raw reply	[flat|nested] 6+ messages in thread