From: Catalin Marinas <catalin.marinas@arm.com>
To: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Christoffer Dall <cdall@cs.columbia.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Brown <broonie@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Date: Fri, 23 Sep 2022 11:26:47 +0100 [thread overview]
Message-ID: <Yy2J52TLL7i2laSZ@arm.com> (raw)
In-Reply-To: <87fsgnlopt.wl-maz@kernel.org>
On Mon, Sep 19, 2022 at 10:04:30AM +0100, Marc Zyngier wrote:
> On Mon, 19 Sep 2022 05:05:31 +0100,
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the kvm-arm tree got a conflict in:
> >
> > arch/arm64/kvm/sys_regs.c
> >
> > between commit:
> >
> > 55adc08d7e64 ("arm64/sysreg: Add _EL1 into ID_AA64PFR0_EL1 definition names")
> >
> > from the arm64 tree and commit:
> >
> > cdd5036d048c ("KVM: arm64: Drop raz parameter from read_id_reg()")
> >
> > from the kvm-arm tree.
[...]
> Catalin, Will: in order to avoid further conflicts, I've taken the
> liberty to merge the arm64/for-next/sysreg branch into kvmarm/next.
> Let me know if that's a problem.
No problem.
> Also, I've resolved the conflict in a slightly different way. Not that
> the above was wrong in any way, but we might as well fix it in a more
> idiomatic way:
>
> /* We can only differ with CSV[23], and anything else is an error */
> val ^= read_id_reg(vcpu, rd);
> - val &= ~((0xFUL << ID_AA64PFR0_CSV2_SHIFT) |
> - (0xFUL << ID_AA64PFR0_CSV3_SHIFT));
> + val &= ~(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV2) |
> + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV3));
> if (val)
> return -EINVAL;
It looks fine, thanks.
--
Catalin
next prev parent reply other threads:[~2022-09-23 10:27 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 4:05 linux-next: manual merge of the kvm-arm tree with the arm64 tree Stephen Rothwell
2022-09-19 9:04 ` Marc Zyngier
2022-09-23 10:26 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-08 1:54 Stephen Rothwell
2024-03-08 6:25 ` Oliver Upton
2024-03-08 12:30 ` Catalin Marinas
2024-03-08 1:47 Stephen Rothwell
2024-02-20 2:21 Stephen Rothwell
2024-02-19 2:58 Stephen Rothwell
2024-02-19 12:14 ` Catalin Marinas
2024-02-19 15:22 ` Marc Zyngier
2024-02-19 15:35 ` Mark Rutland
2024-02-19 15:43 ` Ard Biesheuvel
2024-02-19 16:49 ` Catalin Marinas
2023-10-24 2:28 Stephen Rothwell
2023-10-24 6:49 ` Oliver Upton
2023-10-17 1:30 Stephen Rothwell
2023-10-17 11:13 ` Catalin Marinas
2023-10-18 23:02 ` Oliver Upton
2023-11-01 2:36 ` Stephen Rothwell
2023-06-15 2:45 Stephen Rothwell
2023-06-15 7:37 ` Oliver Upton
2023-06-15 8:32 ` Catalin Marinas
2023-06-15 2:22 Stephen Rothwell
2023-06-15 7:14 ` Catalin Marinas
2023-07-03 0:50 ` Stephen Rothwell
2023-06-06 1:49 Stephen Rothwell
2023-06-06 9:20 ` Catalin Marinas
2023-06-07 1:05 ` Stephen Rothwell
2023-06-07 5:33 ` Oliver Upton
2023-06-07 8:45 ` Catalin Marinas
2023-02-06 1:44 Stephen Rothwell
2023-02-06 4:21 ` Stephen Rothwell
2023-02-06 8:37 ` Marc Zyngier
2023-02-06 8:43 ` Marc Zyngier
2022-05-04 4:35 Stephen Rothwell
2022-05-04 7:06 ` Marc Zyngier
2022-05-04 8:08 ` Catalin Marinas
2022-05-23 6:36 ` Stephen Rothwell
2021-08-19 4:05 Stephen Rothwell
2021-08-20 9:27 ` Catalin Marinas
2021-08-12 3:33 Stephen Rothwell
2021-06-23 5:58 Stephen Rothwell
2021-04-13 5:43 Stephen Rothwell
2021-04-13 11:21 ` Ard Biesheuvel
2021-01-27 5:24 Stephen Rothwell
2020-12-04 5:44 Stephen Rothwell
2020-12-04 11:12 ` Marc Zyngier
2020-12-04 5:17 Stephen Rothwell
2020-09-30 6:26 Stephen Rothwell
2020-05-29 7:00 Stephen Rothwell
2019-07-08 7:24 Stephen Rothwell
2018-10-04 4:22 Stephen Rothwell
2018-10-04 4:07 Stephen Rothwell
2018-07-23 4:46 Stephen Rothwell
2018-07-23 10:45 ` Marc Zyngier
2018-08-16 0:15 ` Stephen Rothwell
2018-08-17 8:32 ` Paolo Bonzini
2018-08-17 9:33 ` Marc Zyngier
2018-06-01 6:23 Stephen Rothwell
2018-06-01 8:23 ` Marc Zyngier
2018-06-01 6:13 Stephen Rothwell
2018-03-28 5:05 Stephen Rothwell
2018-03-29 5:16 ` Stephen Rothwell
2018-03-28 5:00 Stephen Rothwell
2018-03-28 11:53 ` Will Deacon
2017-08-25 4:57 Stephen Rothwell
2017-08-25 8:11 ` Marc Zyngier
2017-08-25 8:44 ` Christoffer Dall
2016-02-29 5:18 Stephen Rothwell
2016-02-24 2:38 Stephen Rothwell
2016-02-22 2:33 Stephen Rothwell
2016-02-22 9:26 ` Catalin Marinas
2016-02-22 2:28 Stephen Rothwell
2016-02-22 9:24 ` Catalin Marinas
2016-02-12 2:26 Stephen Rothwell
2015-01-22 5:07 Stephen Rothwell
2015-01-22 8:51 ` Marc Zyngier
2015-01-22 10:29 ` Mark Rutland
2015-01-22 23:05 ` Stephen Rothwell
2015-01-23 1:36 ` Wei Huang
2015-01-23 11:53 ` Christoffer Dall
2015-01-22 5:06 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=Yy2J52TLL7i2laSZ@arm.com \
--to=catalin.marinas@arm.com \
--cc=broonie@kernel.org \
--cc=cdall@cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--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).