On Mon, May 31, 2021 at 06:52:49PM +0800, Zenghui Yu wrote:
> Hi Greg,
>
> On 2021/5/30 18:46, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> >
> > The patch below does not apply to the 5.12-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@xxxxxxxxxxxxxxx>.
>
> Indeed this patch should be applied to the 5.12-stable tree, together
> with other 2 patches, in order.
>
> [1/3] f5e30680616a ("KVM: arm64: Move __adjust_pc out of line")
> [2/3] 26778aaa134a ("KVM: arm64: Commit pending PC adjustemnts before
> returning to userspace")
> [3/3] e3e880bb1518 ("KVM: arm64: Resolve all pending PC updates before
> immediate exit")
>
> Patch #1 has been applied cleanly onto linux-stable-rc/linux-5.12.y.
> It's just fine. It's expected that there's no functional change with
> patch #1.
That's already in the queue.
> Patch #2 (this patch) can be applied by manually resolving the conflict.
> I can send a patch for it if Marc doesn't get enough bandwidth.
I need a resolution, I couldn't figure out where to put the change in
arch/arm64/include/asm/kvm_asm.h at.
> Patch #3 has been applied in a wrong way [*]. I'll reply to it so that
> you can drop it from the current stable queue.
Ok, will go drop that one right now, thanks!
greg k-h
