On Mon, Oct 28, 2019 at 10:49:37AM +0000, Marc Zyngier wrote: > On Mon, 28 Oct 2019 10:32:17 +0000, > Catalin Marinas <[email protected]> wrote: > > 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 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. > > OK, let me have another look at providing a resolution that includes > all of the above. Worse case, you'll be able to pull the branch > directly.
Don't worry about the resolution, I'll fix it up myself when merging into for-next/core. The latter is not a stable branch, just an octopus merge of various for-next/* topic branches. -- Catalin _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
