Re: FAILED: patch "[PATCH] drm/i915: gen4: work around hang during hibernation" failed to apply to 3.19-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 16 Mar 2015, Bjørn Mork <bjorn@xxxxxxx> wrote:
> Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> writes:
>> On Mon, Mar 16, 2015 at 02:36:53PM +0100, Bjørn Mork wrote:
>>> <gregkh@xxxxxxxxxxxxxxxxxxx> writes:
>>> 
>>> > The patch below does not apply to the 3.19-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>.
>>> 
>>> 
>>> Huh?  That patch applies to v3.19.1 without any changes AFAICS.  What am
>>> I missing?
>>
>> It applies, yes, but breaks the build :(
>>
>> I don't have a "it applied but broke the build" script, sorry, it's such
>> a rare occurrence.  Usually things just don't apply.
>
> Right, I knew I was missing something. Thanks.
>
> The problem is that the fix depends on commit 888d0d421663 ("drm/i915:
> add dev_to_i915 helper").  I've now verified that 3.19-stable builds
> with both patches applied.
>
> But it's of course up to Imre/Daniel/Jani how this should be handled.

I'm fine with either picking that one for stable too, it's small and
simple enough, or someone(tm) modifying the actual fix to not need
that. If the former is okay with Greg, it's easiest.

BR,
Jani.


>
>
> Bjørn

-- 
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]