From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/5] Samsung Exynos updates for 3.16
Date: Fri, 30 May 2014 21:44:26 -0700 [thread overview]
Message-ID: <20140531044426.GE21917@quad.lixom.net> (raw)
In-Reply-To: <5388E32B.3010908@samsung.com>
On Sat, May 31, 2014 at 04:59:39AM +0900, Kukjin Kim wrote:
> The following changes since commit fced6dee29f6fb143fe16ea90331176ff77e6120:
>
> Merge branch 'v3.16-next/cleanup-samsung' into
> v3.16-next/platform-exynos (2014-05-31 02:36:49 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> tags/samsung-exynos
>
> for you to fetch changes up to 9dfa92ec4033c348aae6bafc1881e07229fabaa6:
>
> ARM: EXYNOS: Enable multi-platform build support (2014-05-31
> 02:43:51 +0900)
>
> ----------------------------------------------------------------
> Samsung Exynos updates for 3.16
>
> - add new SoCs support
> : exynos3250, 5260, 5410 and 5800
>
> - enable multi-platform on exynos
> : consolidate exynos related Kconfig entries
>
> Note that this requires tags/samsung-cleanup and tags/samsung-clk-2
> because of mostly migration exynos specific macros into mach-exynos
> and exynos related Kconfig entries.
>
> One more merge conflict happens in arch/arm/Kconfig for ARCH_EXYNOS
> due to SRAM stuff, even though tried to sort them out. Since just
> resolving it would be better I think, please remove ARCH_EXYNOS in
> arch/arm/Kconfig when merge conflict happens.
There was also a conflict in firmware.c due to fixes, please double-check my
resolution of it.
-Olof
prev parent reply other threads:[~2014-05-31 4:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-30 19:59 [GIT PULL 3/5] Samsung Exynos updates for 3.16 Kukjin Kim
2014-05-31 4:40 ` Olof Johansson
2014-05-31 4:44 ` Olof Johansson [this message]
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=20140531044426.GE21917@quad.lixom.net \
--to=olof@lixom.net \
--cc=linux-arm-kernel@lists.infradead.org \
/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