From: Olof Johansson <olof@lixom.net>
To: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@linaro.org>,
arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org, Matus Ujhelyi <ujhelyi.m@gmail.com>
Subject: Re: [GIT PULL] non-critical omap fixes for v3.12 merge window
Date: Thu, 29 Aug 2013 19:11:42 -0700 [thread overview]
Message-ID: <20130830021142.GA2579@quad.lixom.net> (raw)
In-Reply-To: <20130829053705.GL7656@atomide.com>
On Wed, Aug 28, 2013 at 10:37:06PM -0700, Tony Lindgren wrote:
> * Olof Johansson <olof@lixom.net> [130828 11:58]:
> > On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> >
> > > Matus Ujhelyi (1):
> > > ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards
> >
> > Sigh. am33xx has been a bit of a pain this release cycle. Can you please
> > start double-checking builds when you apply am33xx stuff? :(
> >
> > This breaks with:
> >
> > multi_v7_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> >
> > omap2plus_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
>
> Oops sorry, I see what's going on. It builds fine against v3.11-rc6, but
> has a dependency for v3.12 for the cleanup branch that removed all the
> unused defines.
>
> > I've unmerged the branch until that's resolved.
>
> Care to apply the following fix to the cleanup branch?
>
> This way this fixes branch keeps working both against v3.11 and the
> patches queued for v3.12.
Ah, yeah. Applied. And fixes branch pulled, since we'd otherwise just get most
of them during 3.12-rc. :)
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] non-critical omap fixes for v3.12 merge window
Date: Thu, 29 Aug 2013 19:11:42 -0700 [thread overview]
Message-ID: <20130830021142.GA2579@quad.lixom.net> (raw)
In-Reply-To: <20130829053705.GL7656@atomide.com>
On Wed, Aug 28, 2013 at 10:37:06PM -0700, Tony Lindgren wrote:
> * Olof Johansson <olof@lixom.net> [130828 11:58]:
> > On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> >
> > > Matus Ujhelyi (1):
> > > ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards
> >
> > Sigh. am33xx has been a bit of a pain this release cycle. Can you please
> > start double-checking builds when you apply am33xx stuff? :(
> >
> > This breaks with:
> >
> > multi_v7_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> >
> > omap2plus_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
>
> Oops sorry, I see what's going on. It builds fine against v3.11-rc6, but
> has a dependency for v3.12 for the cleanup branch that removed all the
> unused defines.
>
> > I've unmerged the branch until that's resolved.
>
> Care to apply the following fix to the cleanup branch?
>
> This way this fixes branch keeps working both against v3.11 and the
> patches queued for v3.12.
Ah, yeah. Applied. And fixes branch pulled, since we'd otherwise just get most
of them during 3.12-rc. :)
-Olof
next prev parent reply other threads:[~2013-08-30 2:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-23 5:46 [GIT PULL] non-critical omap fixes for v3.12 merge window Tony Lindgren
2013-08-23 5:46 ` Tony Lindgren
2013-08-28 18:26 ` Olof Johansson
2013-08-28 18:26 ` Olof Johansson
2013-08-28 18:50 ` Olof Johansson
2013-08-28 18:50 ` Olof Johansson
2013-08-29 5:37 ` Tony Lindgren
2013-08-29 5:37 ` Tony Lindgren
2013-08-30 2:11 ` Olof Johansson [this message]
2013-08-30 2:11 ` Olof Johansson
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=20130830021142.GA2579@quad.lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
--cc=ujhelyi.m@gmail.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.