On Sun, 23 Sep 2012, Tony Lindgren wrote:
OK thanks, that should work. The nasty merge conflicts seem to have been
caused by mostly commit df3d17e0 (ARM: pmu: remove arm_pmu_type enumeration)
that easily causes a nasty mis-merge of omap_init_pmu() and omap_init_rng()
without removing
* Paul Walmsley p...@pwsan.com [120922 10:48]:
On Fri, 21 Sep 2012, Tony Lindgren wrote:
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?
Probably the
* Tony Lindgren t...@atomide.com [120923 12:11]:
* Paul Walmsley p...@pwsan.com [120922 10:48]:
On Fri, 21 Sep 2012, Tony Lindgren wrote:
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
On Sun, 23 Sep 2012, Tony Lindgren wrote:
* Paul Walmsley p...@pwsan.com [120922 10:48]:
Your tmp-merge contains branch/tag merges that haven't yet gone upstream
to arm-soc. I don't know which of those merges you consider stable (aside
from the upstream ones, obviously).
Well
On Sun, 23 Sep 2012, Tony Lindgren wrote:
Or maybe it's possible to split the series into smaller chunks
that can be pulled in to the existing branches without causing
new merge conflicts?
Well here's what I did, hopefully it's suitable. Built a tag with all of
the clock and hwmod/runtime
* Paul Walmsley p...@pwsan.com [120923 18:09]:
On Sun, 23 Sep 2012, Tony Lindgren wrote:
Or maybe it's possible to split the series into smaller chunks
that can be pulled in to the existing branches without causing
new merge conflicts?
Well here's what I did, hopefully it's suitable.
* Paul Walmsley p...@pwsan.com [120921 22:41]:
On Fri, 21 Sep 2012, Tony Lindgren wrote:
* Tony Lindgren t...@atomide.com [120921 13:55]:
Care to base this on something more mergeable? Maybe a merge
of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7?
While working on this,
On Fri, 21 Sep 2012, Tony Lindgren wrote:
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?
Probably the merge with the clock patches was causing trouble.
That
* Paul Walmsley p...@pwsan.com [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:
* Tony Lindgren t...@atomide.com [120921 13:55]:
* Paul Walmsley p...@pwsan.com [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
On Fri, 21 Sep 2012, Tony Lindgren wrote:
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
* Paul Walmsley p...@pwsan.com [120921 17:04]:
On Fri, 21 Sep 2012, Tony Lindgren wrote:
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
On Fri, 21 Sep 2012, Tony Lindgren wrote:
* Tony Lindgren t...@atomide.com [120921 13:55]:
Care to base this on something more mergeable? Maybe a merge
of cleanup-fixes-for-v3.7 + omap-devel-am33xx-for-v3.7?
While working on this, noticed that the 4430ES2 Panda test boot failed on
the
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
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:
14 matches
Mail list logo
