[Public] > -----Original Message----- > From: Michel Dänzer <mdaenzer@xxxxxxxxxx> > Sent: Thursday, September 16, 2021 9:55 AM > To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Koenig, Christian > <Christian.Koenig@xxxxxxx>; Quan, Evan <Evan.Quan@xxxxxxx>; Lazar, > Lijo <Lijo.Lazar@xxxxxxx>; stable@xxxxxxxxxxxxxxx > Subject: Re: FAILED: patch "[PATCH] drm/amdgpu: Cancel delayed work > when GFXOFF is disabled" failed to apply to 5.14-stable tree > > On 2021-09-16 15:48, Greg KH wrote: > > On Thu, Sep 16, 2021 at 03:39:16PM +0200, Michel Dänzer wrote: > >> On 2021-09-16 15:05, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > >>> > >>> The patch below does not apply to the 5.14-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>. > >> > >> It's already in 5.14, commit 32bc8f8373d2d6a681c96e4b25dca60d4d1c6016. > > > > Odd, how were we supposed to know that? > > Looks like the fix was merged separately for 5.14 and 5.15. I don't know > how/why that happened. Alex / Christian? The fix already landed in drm-next, but since this was before the merge window, we wanted to make sure the fix also landed in stable, so I cherry-picked it to 5.14. I'm not sure of a better way to handle these sort of cases. Alex > > > -- > Earthling Michel Dänzer | > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fredh > at.com%2F&data=04%7C01%7Calexander.deucher%40amd.com%7Ceaf > ba6f5f87c49c5fc0b08d9791987a2%7C3dd8961fe4884e608e11a82d994e183d% > 7C0%7C0%7C637673972820037953%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi > MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C100 > 0&sdata=VQ5VPN9N3%2B0oRSWQDSgwU9D7V6ONdwaE34huiwRYoW8 > %3D&reserved=0 > Libre software enthusiast | Mesa and X developer