linux-next: manual merge of the tegra tree with the s5p tree
in [Kernel]
|
Prev: linux-next: manual merge of the s5p tree with the arm tree
Next: linux-next: manual merge of the tegra tree with the arm and s5p trees
From: Stephen Rothwell on 29 Jul 2010 21:00 Hi all, Today's linux-next merge of the tegra tree got a conflict in arch/arm/mm/Kconfig between commit 9d2ef2d3944bb387df220fdeec93abc38b62b627 ("ARM: S5PV310: Add new Kconfig and Makefiles") from the s5p tree and commit 7e3b9536bd5ba23b3c94055bdf8c2fd45d9f8e62 ("[ARM] tegra: initial tegra support") from the tegra tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc arch/arm/mm/Kconfig index d6ffcee,aa26573..0000000 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@@ -772,7 -783,7 +772,7 @@@ config CACHE_L2X depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ - ARCH_S5PV310 - ARCH_TEGRA ++ ARCH_S5PV310 || ARCH_TEGRA default y select OUTER_CACHE select OUTER_CACHE_SYNC -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Kukjin Kim on 29 Jul 2010 22:00 Stephen Rothwell wrote: > > Hi all, > Hi, > Today's linux-next merge of the tegra tree got a conflict in > arch/arm/mm/Kconfig between commit > 9d2ef2d3944bb387df220fdeec93abc38b62b627 ("ARM: S5PV310: Add new > Kconfig > and Makefiles") from the s5p tree and commit > 7e3b9536bd5ba23b3c94055bdf8c2fd45d9f8e62 ("[ARM] tegra: initial tegra > support") from the tegra tree. > > I fixed it up (see below) and can carry the fix as necessary. If there is some conflicts, how can/should I do for it... Stephen, please let me know. > -- > Cheers, > Stephen Rothwell sfr(a)canb.auug.org.au > > diff --cc arch/arm/mm/Kconfig > index d6ffcee,aa26573..0000000 > --- a/arch/arm/mm/Kconfig > +++ b/arch/arm/mm/Kconfig > @@@ -772,7 -783,7 +772,7 @@@ config CACHE_L2X > depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || > MACH_REALVIEW_PB1176 || \ > REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || > MACH_REALVIEW_PBX || \ > ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || > ARCH_VEXPRESS_CA9X4 || \ > - ARCH_S5PV310 > - ARCH_TEGRA > ++ ARCH_S5PV310 || ARCH_TEGRA > default y > select OUTER_CACHE > select OUTER_CACHE_SYNC Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim(a)samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 30 Jul 2010 00:10
Hi, On Fri, 30 Jul 2010 10:57:41 +0900 Kukjin Kim <kgene.kim(a)samsung.com> wrote: > > If there is some conflicts, how can/should I do for it... > Stephen, please let me know. In this case, do nothing :-) The conflicts will get fixed up when either Russell or Linus merges your tree into theirs. My email was more of a "heads up" to let you know that there is some conflict. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |