From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7
Date: Fri, 21 Sep 2012 17:21:11 -0700 [thread overview]
Message-ID: <20120922002111.GP28835@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1209220002290.6510@utopia.booyaka.com>
* Paul Walmsley <paul@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 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.
>
> > 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
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7
Date: Fri, 21 Sep 2012 17:21:11 -0700 [thread overview]
Message-ID: <20120922002111.GP28835@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1209220002290.6510@utopia.booyaka.com>
* Paul Walmsley <paul@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 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.
>
> > 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
next prev parent reply other threads:[~2012-09-22 0:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 1:04 [GIT PULL] ARM: OMAP: hwmod/PMU/PRCM patches for 3.7 Paul Walmsley
2012-09-21 1:04 ` Paul Walmsley
2012-09-21 20:53 ` Tony Lindgren
2012-09-21 20:53 ` Tony Lindgren
2012-09-21 23:10 ` Tony Lindgren
2012-09-21 23:10 ` Tony Lindgren
2012-09-22 0:03 ` Paul Walmsley
2012-09-22 0:03 ` Paul Walmsley
2012-09-22 0:21 ` Tony Lindgren [this message]
2012-09-22 0:21 ` Tony Lindgren
2012-09-22 17:47 ` Paul Walmsley
2012-09-22 17:47 ` Paul Walmsley
2012-09-23 19:09 ` Tony Lindgren
2012-09-23 19:09 ` Tony Lindgren
2012-09-23 21:06 ` Tony Lindgren
2012-09-23 21:06 ` Tony Lindgren
2012-09-24 1:08 ` Paul Walmsley
2012-09-24 1:08 ` Paul Walmsley
2012-09-24 2:30 ` Tony Lindgren
2012-09-24 2:30 ` Tony Lindgren
2012-09-24 19:51 ` Paul Walmsley
2012-09-24 19:51 ` Paul Walmsley
2012-09-23 22:59 ` Paul Walmsley
2012-09-23 22:59 ` Paul Walmsley
2012-09-22 5:40 ` Paul Walmsley
2012-09-22 5:40 ` Paul Walmsley
2012-09-22 15:44 ` Tony Lindgren
2012-09-22 15:44 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120922002111.GP28835@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.