From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>,
'Erik Gilling' <konkers@android.com>,
'Colin Cross' <ccross@android.com>,
'Olof Johansson' <olof@lixom.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
'Changhwan Youn' <chaos.youn@samsung.com>
Subject: RE: linux-next: manual merge of the tegra tree with the s5p tree
Date: Fri, 30 Jul 2010 10:57:41 +0900 [thread overview]
Message-ID: <015801cb2f8a$9bca9b90$d35fd2b0$%kim@samsung.com> (raw)
In-Reply-To: <20100730105834.d7ac047f.sfr@canb.auug.org.au>
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@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@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2010-07-30 1:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-30 0:58 linux-next: manual merge of the tegra tree with the s5p tree Stephen Rothwell
2010-07-30 1:57 ` Kukjin Kim [this message]
2010-07-30 4:03 ` 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='015801cb2f8a$9bca9b90$d35fd2b0$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=ccross@android.com \
--cc=chaos.youn@samsung.com \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox