Thread (14 messages) flat view 14 messages, 2 authors, 2012-09-24

[GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7

From: tony@atomide.com (Tony Lindgren)
Date: 2012-09-22 00:21:11
Also in: linux-omap

* Paul Walmsley [off-list ref] [120921 17:04]:
On Fri, 21 Sep 2012, Tony Lindgren wrote:
quoted
I tried merging this into tmp-merge, but ran into all kinds of
merge conflicts with the am33xx code etc and ended up with a
result that booted with all kinds of warnings on 2430sdp and
did not boot at all on zoom3 :) So I probably did something
wrong..

Care to base this on something more mergeable?
Just let me know what you want me to base it on.
quoted
Maybe a merge of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7?
The series rebases cleanly onto cleanup-fixes-for-v3.7 + 
omap-devel-am33xx-for-v3.7, so I guess you'll probably want me to base it 
somewhere else?
Hmm I wonder what's causing it then? There must be something
else in tmp-merge at commit abfee61f that causes the problems.
Maybe try to merge with that commit and see what you get?

That commit can't be used as a base though as that's temporary
most likely.. But we can create a base to use out of the
branches once we know them, you can do it yourself too.

Regards,

Tony
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help