From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Nicolas Pitre <nico@fluxnic.net>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [GIT PULL] omap twl cleanup for v3.1 merge window
Date: Sat, 9 Jul 2011 23:55:37 -0700 [thread overview]
Message-ID: <20110710065537.GD5783@atomide.com> (raw)
In-Reply-To: <201107081741.23425.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [110708 08:36]:
> On Friday 08 July 2011, Tony Lindgren wrote:
> >
> >I've attached a conflict resolution patch too, it's trivial execpt
> >note that .vdac needs to be removed in board-rx51-peripherals.c.
> >
> >If this conflict causes problems for you, I can also base this series
> >on omap/board.
>
> The conflict resolution you suggested doesn't build here:
...
>
> These are removed in the cleanup series, but changed in the fixes branch,
> now the removal is undone
Hmm these are added in omap/board. Maybe the issue is caused by not
merging omap/board also?
> I tried a different path, but then got
>
> arch/arm/mach-omap2/board-4430sdp.c:406:41: warning: 'sdp4430_vmmc_supply' defined but not used [-Wunused-variable]
>
> Should that variable be removed or kept referenced?
That's added in omap/board. I think the resolution I posted
should work if you merge omap/cleanup omap/fixes and omap/board
into your master branch.
Or maybe I'm missing something. If you want, I can try out your
merge here 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] omap twl cleanup for v3.1 merge window
Date: Sat, 9 Jul 2011 23:55:37 -0700 [thread overview]
Message-ID: <20110710065537.GD5783@atomide.com> (raw)
In-Reply-To: <201107081741.23425.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [110708 08:36]:
> On Friday 08 July 2011, Tony Lindgren wrote:
> >
> >I've attached a conflict resolution patch too, it's trivial execpt
> >note that .vdac needs to be removed in board-rx51-peripherals.c.
> >
> >If this conflict causes problems for you, I can also base this series
> >on omap/board.
>
> The conflict resolution you suggested doesn't build here:
...
>
> These are removed in the cleanup series, but changed in the fixes branch,
> now the removal is undone
Hmm these are added in omap/board. Maybe the issue is caused by not
merging omap/board also?
> I tried a different path, but then got
>
> arch/arm/mach-omap2/board-4430sdp.c:406:41: warning: 'sdp4430_vmmc_supply' defined but not used [-Wunused-variable]
>
> Should that variable be removed or kept referenced?
That's added in omap/board. I think the resolution I posted
should work if you merge omap/cleanup omap/fixes and omap/board
into your master branch.
Or maybe I'm missing something. If you want, I can try out your
merge here too.
Regards,
Tony
next prev parent reply other threads:[~2011-07-10 6:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 13:01 [GIT PULL] omap twl cleanup for v3.1 merge window Tony Lindgren
2011-07-08 13:01 ` Tony Lindgren
2011-07-08 15:41 ` Arnd Bergmann
2011-07-08 15:41 ` Arnd Bergmann
2011-07-10 6:55 ` Tony Lindgren [this message]
2011-07-10 6:55 ` Tony Lindgren
2011-07-10 10:17 ` Tony Lindgren
2011-07-10 10:17 ` Tony Lindgren
2011-07-10 19:50 ` Tony Lindgren
2011-07-10 19:50 ` 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=20110710065537.GD5783@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=tglx@linutronix.de \
/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.