On Wed, 2024-02-21 at 12:26 +0100, Heiko Carstens wrote:
> On Wed, Feb 21, 2024 at 08:49:58AM +0100, Janosch Frank wrote:
> > On 2/20/24 22:12, Eric Farman wrote:
> > > Hi Janosch,
> > > 
> > > Here is a new (final?) version for the AR/MEM_OP issue I'm
> > > attempting to
> > > address. Hopefully they can be picked up to whatever tree makes
> > > sense.
> > > 
> > 
> > I've got good and bad news for you :)
> > 
> > You need to re-base this patch set on Heiko's feature branch once
> > my kvm fpu
> > patch is on there since the current version runs into conflicts
> > with Heiko's
> > fpu rework. We'll contact you once that's the case. The patch made
> > it onto
> > devel yesterday evening and I assumed you'd wait a bit until
> > sending a new
> > version but I was mistaken.
> 
> I resolved the trivial merge conflict - no need to resend anything.
> 
> Series applied, thanks!

Ah, sorry about that, I didn't notice the other fpu stuff go through.
Thank you, Heiko!

Reply via email to