The code moved around. Seems the indenting changed. Also it was trying to apply the patch to the wrong place, I think the indenting caused it to try to apply to a different function, which it then failed to apply to. Peter. -----Original Message----- From: daniel.vetter@xxxxxxxx [mailto:daniel.vetter@xxxxxxxx] On Behalf Of Daniel Vetter Sent: Tuesday, June 23, 2015 12:33 PM To: Nikula, Jani Cc: Antoine, Peter; stable Subject: Re: [PATCH] drm/i915: Avoid GPU hang when coming out of s3 or s4 On Tue, Jun 23, 2015 at 9:12 AM, Jani Nikula <jani.nikula@xxxxxxxxx> wrote: >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600 >> Cc: stable@xxxxxxxxxxxxxxx # 4.0+ >> Signed-off-by: Peter Antoine <peter.antoine@xxxxxxxxx> >> Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> >> [Jani: fixed typo in subject, massaged the comments a bit] >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > ...although based on the patch context I'm not sure why this needs a > separate backport. Does it not cherry-pick cleanly to 4.0? The stable > team should take care of these automatically. stable team said it failed to apply a while back, hence the manual backport. Not sure what exactly upset things, Peter should know if there was anything to resolve. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ��.n��������+%������w��{.n�����������ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f