From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <krzk@kernel.org>,
Russell King <rmk@armlinux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: linux-next: manual merge of the samsung-krzk tree with the arm tree
Date: Fri, 21 Jun 2019 09:33:47 +1000 [thread overview]
Message-ID: <20190621093347.36987c97@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
Hi all,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/configs/exynos_defconfig
between commit:
5f41f9198f29 ("ARM: 8864/1: Add workaround for I-Cache line size mismatch between CPU cores")
from the arm tree and commit:
9f532d26c75c ("ARM: exynos_defconfig: Trim and reorganize with savedefconfig")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/configs/exynos_defconfig
index 9b959afaaa12,f140532ddca7..000000000000
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT=
CONFIG_CGROUPS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_PERF_EVENTS=y
- CONFIG_MODULES=y
- CONFIG_MODULE_UNLOAD=y
- CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_EXYNOS=y
- CONFIG_ARCH_EXYNOS3=y
+CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
CONFIG_SMP=y
CONFIG_BIG_LITTLE=y
CONFIG_NR_CPUS=8
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-06-20 23:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 23:33 Stephen Rothwell [this message]
2019-06-27 23:16 ` linux-next: manual merge of the samsung-krzk tree with the arm tree Stephen Rothwell
2019-07-09 0:12 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-12-19 22:40 Stephen Rothwell
2021-12-20 22:53 ` Stephen Rothwell
2021-12-21 7:58 ` Krzysztof Kozlowski
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=20190621093347.36987c97@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=rmk@armlinux.org.uk \
/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