From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Will Deacon <will@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Marc Zyngier <marc.zyngier@arm.com>,
James Morse <james.morse@arm.com>
Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree
Date: Mon, 28 Oct 2019 08:39:40 +0000 [thread overview]
Message-ID: <20191028083939.GA10942@iMac-3.local> (raw)
In-Reply-To: <20191028083914.4735554b@canb.auug.org.au>
Hi Stephen,
On Mon, Oct 28, 2019 at 08:39:14AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got conflicts in:
>
> arch/arm64/include/asm/cpucaps.h
> arch/arm64/kernel/cpu_errata.c
>
> between commits:
>
> d3ec3a08fa70 ("arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set")
> 93916beb7014 ("arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT")
> 9405447ef79b ("arm64: Avoid Cavium TX2 erratum 219 when switching TTBR")
>
> from Linus' tree and commit:
>
> 05460849c3b5 ("arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419")
>
> from the arm64 tree.
Thanks for this. The conflict resolution is correct.
--
Catalin
next prev parent reply other threads:[~2019-10-28 8:39 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 21:39 linux-next: manual merge of the arm64 tree with Linus' tree Stephen Rothwell
2019-10-28 8:39 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-24 21:36 Stephen Rothwell
2023-01-25 9:26 ` Catalin Marinas
2022-03-08 22:42 Stephen Rothwell
2022-03-09 12:20 ` Will Deacon
2022-03-08 22:38 Stephen Rothwell
2021-11-03 22:32 Stephen Rothwell
2021-11-05 9:34 ` Will Deacon
2021-03-28 22:29 Stephen Rothwell
2021-03-29 9:22 ` Catalin Marinas
2020-07-26 23:18 Stephen Rothwell
2019-06-24 23:31 Stephen Rothwell
2018-12-10 21:52 Stephen Rothwell
2018-12-11 10:16 ` Catalin Marinas
2018-12-06 22:18 Stephen Rothwell
2018-12-07 12:16 ` Will Deacon
2018-12-07 14:27 ` Suzuki K Poulose
2018-07-23 22:50 Stephen Rothwell
2018-07-24 9:29 ` Will Deacon
2018-01-16 22:30 Stephen Rothwell
2018-01-16 22:25 Stephen Rothwell
2018-01-14 21:32 Stephen Rothwell
2018-01-14 21:40 ` Catalin Marinas
2018-01-11 21:23 Stephen Rothwell
2018-01-12 12:25 ` Catalin Marinas
2017-10-31 20:57 Stephen Rothwell
2017-11-13 6:09 ` Stephen Rothwell
2017-11-13 9:15 ` Catalin Marinas
2017-11-13 10:38 ` Lorenzo Pieralisi
2017-10-19 11:28 Mark Brown
2017-10-19 12:50 ` Lorenzo Pieralisi
2017-08-23 23:22 Stephen Rothwell
2017-09-04 5:59 ` Stephen Rothwell
2016-11-21 23:34 Stephen Rothwell
2016-11-22 13:31 ` Catalin Marinas
2016-09-11 23:17 Stephen Rothwell
2016-09-05 1:27 Stephen Rothwell
2016-07-11 0:14 Stephen Rothwell
2016-04-28 23:59 Stephen Rothwell
2016-04-29 8:49 ` Will Deacon
2016-03-21 23:15 Stephen Rothwell
2016-03-23 11:14 ` Catalin Marinas
2016-03-06 23:48 Stephen Rothwell
2015-10-31 23:53 Stephen Rothwell
2015-11-02 10:39 ` Catalin Marinas
2015-01-26 23:45 Stephen Rothwell
2013-06-17 0:37 Stephen Rothwell
2012-12-05 23:17 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=20191028083939.GA10942@iMac-3.local \
--to=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.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;
as well as URLs for NNTP newsgroup(s).