Messages in this thread | | | Date | Fri, 23 Sep 2022 11:26:47 +0100 | From | Catalin Marinas <> | Subject | Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree |
| |
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
| |