From: Krzysztof Kozlowski <krzk@kernel.org>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
arm@kernel.org
Cc: "linux-samsung-soc@vger.kernel.org"
<linux-samsung-soc@vger.kernel.org>,
Kukjin Kim <kgene@kernel.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 4/4] ARM: exynos: Mach for v5.3
Date: Wed, 26 Jun 2019 11:15:18 +0200 [thread overview]
Message-ID: <CAJKOXPejHBKp1fnhqaKwx2vby1_XmP916TyA9Nw8usU5QNadbA@mail.gmail.com> (raw)
In-Reply-To: <20190625193451.7696-4-krzk@kernel.org>
On Tue, 25 Jun 2019 at 21:35, Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
>
> Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-5.3
>
> for you to fetch changes up to a55e040c6f21f55f81c53c56e1d8095df35e1d02:
>
> ARM: exynos: Cleanup cppcheck shifting warning (2019-06-25 20:45:09 +0200)
>
> ----------------------------------------------------------------
> Samsung mach/soc changes for v5.3
>
> Only cleanups and minor fixes.
>
> ----------------------------------------------------------------
> Arnd Bergmann (1):
> ARM: exynos: Only build MCPM support if used
Hi,
I forgot to mention possible merge conflict (although Stephen Cc-ed
you on mails). Resolution is to accept both sides:
diff --cc arch/arm/mach-exynos/Makefile
index 5ccf9d7e58d4,5abf3db23912..0fd3fcf8bfb0
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -14,5 -14,9 +14,5 @@@ obj-$(CONFIG_PM_SLEEP) += suspend.
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
- obj-$(CONFIG_MCPM) += mcpm-exynos.o
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)
-
+ obj-$(CONFIG_EXYNOS_MCPM) += mcpm-exynos.o
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-26 9:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 19:34 [GIT PULL 1/4] ARM: defconfig: Samsung/Exynos for v5.3 Krzysztof Kozlowski
2019-06-25 19:34 ` [GIT PULL 2/4] ARM: dts: exynos: Second pull " Krzysztof Kozlowski
2019-06-27 2:23 ` Olof Johansson
2019-06-25 19:34 ` [GIT PULL 3/4] arm64: dts: exynos: Pull " Krzysztof Kozlowski
2019-06-27 2:24 ` Olof Johansson
2019-06-25 19:34 ` [GIT PULL 4/4] ARM: exynos: Mach " Krzysztof Kozlowski
2019-06-26 9:15 ` Krzysztof Kozlowski [this message]
2019-06-27 2:30 ` Olof Johansson
2019-06-26 9:14 ` [GIT PULL 1/4] ARM: defconfig: Samsung/Exynos " Krzysztof Kozlowski
2019-06-27 2:28 ` Olof Johansson
2019-06-27 2:27 ` Olof Johansson
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=CAJKOXPejHBKp1fnhqaKwx2vby1_XmP916TyA9Nw8usU5QNadbA@mail.gmail.com \
--to=krzk@kernel.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
/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;
as well as URLs for NNTP newsgroup(s).