Re: [PATCH v2 00/38] arm64/sysreg: Convert aarch32 id regs

From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
	James Morse <james.morse@arm.com>,
	catalin.marinas@arm.com, kernel-team@android.com,
	Mark Brown <broonie@kernel.org>
Subject: Re: [PATCH v2 00/38] arm64/sysreg: Convert aarch32 id regs
Date: Fri, 02 Dec 2022 15:52:51 +0000	[thread overview]
Message-ID: <87fsdxu7jg.wl-maz@kernel.org> (raw)
In-Reply-To: <166990999860.393022.5763465101561471118.b4-ty@kernel.org>

On Fri, 02 Dec 2022 11:17:42 +0000,
Will Deacon <will@kernel.org> wrote:
> 
> [+Marc]
> 
> On Wed, 30 Nov 2022 17:15:59 +0000, James Morse wrote:
> > Changes since the v1
> >  * Duplicate definition muck up in patch 29 fixed.
> >  * Rebased onto arm64/for-next/sysregs, which is just rc4.
> > 
> 
> Applied to arm64 (for-next/sysregs), thanks!
> 
> Note that this conflicts with Marc's PMU rework in the kvmarm tree in
> slightly annoying ways (things like "IMP_DEF" => "IMPDEF"). I've had a
> crack at resolving that at the end of this email.

Thanks. I've done a merge and ended up with the same resolution, so
something must be vaguely correct.

The more annoying part is that the kvmarm/next branch is based on rc3,
while this drags rc4 into the mix, leading to a pretty ugly changelog.

I'll rebuild the branch next week with rc4 as the merge base, which
should be less awful.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel