[linux-yocto] [PATCH 0/2] Fix merge errors on bxt-rebase branch

[Bruce Ashfield]

On 2016-11-16 02:29 AM, Laitinen, Jukka wrote:
>> On 2016-11-14 07:43 AM, Jukka Laitinen wrote:
>>> The i915 module stopped compiling in 4.4.30 rebase. These patches fix
>>> the merge errors causing this.
>>>
>>
>> I tried the patches here, and ones directly from gmail/the mailing list and they are all showing up as corrupted.
>>
>> I tried to fix them up, but can't put my finger on what part has been mangled.
>>
>> Can you do a resend ?
>>
>> Bruce
>
> I am really sorry about that. I managed to corrupt them with thunderbird. I have now re-sent the patches.
>

No problem .. it happens :D

These are now merged.

Bruce

> Jukka
>
> ---------------------------------------------------------------------
> Intel Finland Oy
> Registered Address: PL 281, 00181 Helsinki
> Business Identity Code: 0357606 - 4
> Domiciled in Helsinki
>
> This e-mail and any attachments may contain confidential material for
> the sole use of the intended recipient(s). Any review or distribution
> by others is strictly prohibited. If you are not the intended
> recipient, please contact the sender and delete all copies.
>