From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Fri, 21 Sep 2012 16:10:40 -0700 Subject: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7 In-Reply-To: <20120921205322.GK28835@atomide.com> References: <20120921205322.GK28835@atomide.com> Message-ID: <20120921231039.GN28835@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Tony Lindgren [120921 13:55]: > * Paul Walmsley [120920 18:05]: > > Hi Tony > > > > The following changes since commit c4dbc7c086ce96d17f18b7a4a965b01d54d45f46: > > > > Merge tag 'cleanup-fixes-for-v3.7' into test_merge_v3.6-rc6_cleanup-fixes (2012-09-19 13:54:08 -0600) > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git tags/omap-devel-b-for-3.7 > > Thanks pulling into devel-late. > > Note that we're pretty much out of time for v3.7 merge window, so > most likely this won't get merged until for v3.8. See message > "Status of arm-soc for 3.7" posted to LAKML for details. 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? Maybe a merge of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7? Ideally it would be based on something that merges nicely when pulled into arm-soc/for-next, but that might be a bit hard to do right now. Regards, Tony