linux-next: merge error in arch/arm/mm/Kconfig?
diff mbox

Message ID 20110725041720.GA21641@S2100-06.ap.freescale.net
State New, archived
Headers show

Commit Message

Shawn Guo July 25, 2011, 4:17 a.m. UTC
There is a merge error (?) causing 'make ARCH=arm menuconfig' fails on
next-20110722.

---8<-------------

Comments

Stephen Rothwell July 25, 2011, 4:23 a.m. UTC | #1
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.
Stephen Rothwell July 25, 2011, 4:37 a.m. UTC | #2
Hi Shawn,

On Mon, 25 Jul 2011 12:40:27 +0800 Shawn Guo <shawn.guo@freescale.com> wrote:
>
> Sorry for the noise, Stephen.  I should have searched the list before
> posting.

Thanks OK, I would rather have 2 reports than none.
Shawn Guo July 25, 2011, 4:40 a.m. UTC | #3
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.

Patch
diff mbox

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