All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: merge error in arch/arm/mm/Kconfig?
@ 2011-07-25  4:17 ` Shawn Guo
  0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2011-07-25  4:17 UTC (permalink / raw)
  To: linux-next; +Cc: linux-arm-kernel, Stephen Rothwell

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


-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: merge error in arch/arm/mm/Kconfig?
@ 2011-07-25  4:17 ` Shawn Guo
  0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2011-07-25  4:17 UTC (permalink / raw)
  To: linux-arm-kernel

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


-- 
Regards,
Shawn

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: merge error in arch/arm/mm/Kconfig?
  2011-07-25  4:17 ` Shawn Guo
@ 2011-07-25  4:23   ` Stephen Rothwell
  -1 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-07-25  4:23 UTC (permalink / raw)
  To: Shawn Guo; +Cc: linux-next, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: merge error in arch/arm/mm/Kconfig?
@ 2011-07-25  4:23   ` Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-07-25  4:23 UTC (permalink / raw)
  To: linux-arm-kernel

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.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110725/4a422220/attachment.sig>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: merge error in arch/arm/mm/Kconfig?
  2011-07-25  4:40     ` Shawn Guo
@ 2011-07-25  4:37       ` Stephen Rothwell
  -1 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-07-25  4:37 UTC (permalink / raw)
  To: Shawn Guo; +Cc: linux-next, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: merge error in arch/arm/mm/Kconfig?
@ 2011-07-25  4:37       ` Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-07-25  4:37 UTC (permalink / raw)
  To: linux-arm-kernel

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.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110725/ebd50269/attachment.sig>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: merge error in arch/arm/mm/Kconfig?
  2011-07-25  4:23   ` Stephen Rothwell
@ 2011-07-25  4:40     ` Shawn Guo
  -1 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2011-07-25  4:40 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: merge error in arch/arm/mm/Kconfig?
@ 2011-07-25  4:40     ` Shawn Guo
  0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2011-07-25  4:40 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-07-25  4:40 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2011-07-25  4:40     ` Shawn Guo
2011-07-25  4:37     ` Stephen Rothwell
2011-07-25  4:37       ` Stephen Rothwell

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.