All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@freescale.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: merge error in arch/arm/mm/Kconfig?
Date: Mon, 25 Jul 2011 12:40:27 +0800	[thread overview]
Message-ID: <20110725044026.GB21641@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <20110725142348.efb4e0317938c2261498db32@canb.auug.org.au>

On Mon, Jul 25, 2011 at 02:23:48PM +1000, Stephen Rothwell wrote:
> Hi Shawn,
> 
> On Mon, 25 Jul 2011 12:17:22 +0800 Shawn Guo <shawn.guo@freescale.com> wrote:
> >
> > There is a merge error (?) causing 'make ARCH=arm menuconfig' fails on
> > next-20110722.
> > 
> > ---8<-------------
> > diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> > index d490c4a..2df5504 100644
> > --- a/arch/arm/mm/Kconfig
> > +++ b/arch/arm/mm/Kconfig
> > @@ -834,7 +834,7 @@ config CACHE_L2X0
> >         depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
> >                    REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
> >                    ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
> > -                  ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE ||
> > +                  ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
> >                    ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
> >         default y
> >         select OUTER_CACHE
> 
> Yeah, I reported this on Friday and it will be fixed in today's linux-next.
> 
Sorry for the noise, Stephen.  I should have searched the list before
posting.

-- 
Regards,
Shawn

WARNING: multiple messages have this Message-ID (diff)
From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: merge error in arch/arm/mm/Kconfig?
Date: Mon, 25 Jul 2011 12:40:27 +0800	[thread overview]
Message-ID: <20110725044026.GB21641@S2100-06.ap.freescale.net> (raw)
In-Reply-To: <20110725142348.efb4e0317938c2261498db32@canb.auug.org.au>

On Mon, Jul 25, 2011 at 02:23:48PM +1000, Stephen Rothwell wrote:
> Hi Shawn,
> 
> On Mon, 25 Jul 2011 12:17:22 +0800 Shawn Guo <shawn.guo@freescale.com> wrote:
> >
> > There is a merge error (?) causing 'make ARCH=arm menuconfig' fails on
> > next-20110722.
> > 
> > ---8<-------------
> > diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> > index d490c4a..2df5504 100644
> > --- a/arch/arm/mm/Kconfig
> > +++ b/arch/arm/mm/Kconfig
> > @@ -834,7 +834,7 @@ config CACHE_L2X0
> >         depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
> >                    REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
> >                    ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
> > -                  ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE ||
> > +                  ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
> >                    ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
> >         default y
> >         select OUTER_CACHE
> 
> Yeah, I reported this on Friday and it will be fixed in today's linux-next.
> 
Sorry for the noise, Stephen.  I should have searched the list before
posting.

-- 
Regards,
Shawn

  reply	other threads:[~2011-07-25  4:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-25  4:17 linux-next: merge error in arch/arm/mm/Kconfig? Shawn Guo
2011-07-25  4:17 ` Shawn Guo
2011-07-25  4:23 ` Stephen Rothwell
2011-07-25  4:23   ` Stephen Rothwell
2011-07-25  4:40   ` Shawn Guo [this message]
2011-07-25  4:40     ` Shawn Guo
2011-07-25  4:37     ` Stephen Rothwell
2011-07-25  4:37       ` Stephen Rothwell

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=20110725044026.GB21641@S2100-06.ap.freescale.net \
    --to=shawn.guo@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.