clk: ux500: Make mtu driver use apb_pclock
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest0 of 2 patches 0 repliesNew
Patches in v1 No applies recorded yet
None of the 2 patches the cover letter announces are in this archive.
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/2] clk: ux500: Make mtu driver use apb_pclock
Quoted 14 lines · Linus Walleij
Quoted 10 lines · Mike Turquette
Quoting Linus Walleij (2012-11-11 10:47:46)
Quoted 7 lines
I don't know quite how ingenious git is in detecting patches on moved files, but if it's causing trouble I think it's better if you could ACK them and we could reubmit them to ARM SoC on the multiplatform branch. i.e. this one:
http://git.kernel.org/?p=linux/kernel/git/arm/arm-soc.git;a=shortlog;h=refs/heads/next/multiplatformQuoted 2 lines
Those patches have my ACK. Do you want to wait to see if something goes boom or would you rather I drop them from clk-next preemptively?
Quoted 7 lines
Hm that's basically a question of how smart git is when merging these trees together.
Arnd, Olof: what is your experience? If one tree is moving files and another tree is patching them, should we try to rebase these onto your branch in ARM SoC and submit them there instead?
rename vs change conflicts are usually handled, but not always. The one thing that never works is when part of one file is moved into another file (or two files get merged into one) and another patch changes the same file.
If I understand the problem at hand correctly, the safe solution should be to base the ux500 clk changes on top of c3b9d1db23c4e, which is in the nomadik/plat-removal branch in arm-soc that got merged into next/multiplatform. I would prefer if you use that as a base instead of the larger next/multiplatform branch that also contains vt8500 and other changes.
Arnd