mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [GIT PULL 0/8] Second batch of arm-soc branches for 3.5
@ 2012-05-26  7:22 Olof Johansson
  2012-05-26  7:22 ` [GIT PULL 1/8] arm-soc: defconfig updates Olof Johansson
                   ` (7 more replies)
  0 siblings, 8 replies; 11+ messages in thread
From: Olof Johansson @ 2012-05-26  7:22 UTC (permalink / raw)
  To: torvalds; +Cc: arm, linux-kernel, linux-arm-kernel

Hi Linus,

This is the second and last large set of arm-soc branches for the 3.5
merge window. There will likely be a couple of small pull requests next
week (and thereafter fixes).

Descriptions of each branch are in the corresponding request.

Most of them have some trivial merge conflicts with earlier branches or
other code that has gone in since they were staged. Notes below are for
the slightly trickier cases. Just like with the last batch I've pushed
up resolved/<tagname> branches with proposed resolutions if you want
to compare.

cleanup2 branch:
omap_init_clocksource_32k(): Keep the version from this branch but add
in the register_persistent_clock() addition from bd0493e.

clock branch:
An awkward add/remove conflict in mach-kirkwood/common.c. Code is removed
here that was fixed in one of our earlier branches. The right thing to
do is to still just remove the code.

dt2 branch:
gpio-mxs.c: Keep the (port) side but change false -> 0 on the last arg.

soc2 branch:
gpio-samsung.c: Slightly awkward move/change conflict. Essentially
re-apply the second hunk of f10590c9 in the moved function
(exynos5_gpiolib_init()).

cleanup-initcall branch:
Trivial conflict deltas and a deleted file conflict. The removed file
should remain removed.


Thanks!

-Olof

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

end of thread, other threads:[~2012-05-26 19:53 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-26  7:22 [GIT PULL 0/8] Second batch of arm-soc branches for 3.5 Olof Johansson
2012-05-26  7:22 ` [GIT PULL 1/8] arm-soc: defconfig updates Olof Johansson
2012-05-26  7:22 ` [GIT PULL 2/8] arm-soc: driver specific updates Olof Johansson
2012-05-26  7:22 ` [GIT PULL 3/8] arm-soc: cleanups, part 2 Olof Johansson
2012-05-26  7:22 ` [GIT PULL 4/8] arm-soc: clock driver changes Olof Johansson
2012-05-26 19:47   ` Linus Torvalds
2012-05-26 19:53     ` Olof Johansson
2012-05-26  7:22 ` [GIT PULL 5/8] arm-soc: add stmp-dev library code Olof Johansson
2012-05-26  7:22 ` [GIT PULL 6/8] arm-soc: device tree conversions, part 2 Olof Johansson
2012-05-26  7:22 ` [GIT PULL 7/8] arm-soc: soc specific changes, " Olof Johansson
2012-05-26  7:22 ` [GIT PULL 8/8] arm-soc: sweeping late_initcall cleanup Olof Johansson

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®