On Sat, Oct 26, 2019 at 11:20:35AM +0100, Marc Zyngier wrote: > Catalin, Will: given that this series conflicts with the workaround for > erratum 1542419, do you mind taking it via the arm64 tree? I assume you target 5.5 with this workaround. I don't mind merging it but if you want to queue it, we already have a stable for-next/neoverse-n1-stale-instr branch with 1542419 (I'll push a fixup on top soon for a clang warning). The other issue is that we get a conflict with mainline due to the tx2 erratum. If it gets too complicated, I'll also merge for-next/fixes into for-next/core. -- Catalin