lkml.org 
[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: pull-request: wireless-drivers-next 2019-04-18
Date
David Miller <davem@davemloft.net> writes:

> From: Kalle Valo <kvalo@codeaurora.org>
> Date: Thu, 18 Apr 2019 16:48:20 +0300
>
>> here's a pull request to net-next for v5.2, more info below. But do note
>> that this time we have two trivial conflicts in iwlwifi, here are
>> Stephen's example resolutions:
>>
>> https://lkml.kernel.org/r/20190415120133.40c0f343@canb.auug.org.au
>>
>> https://lkml.kernel.org/r/20190415120853.39e0e46a@canb.auug.org.au
>>
>> The only change to Stephen's resolution I recommend is to have in drv.c
>> an empty line between group 0x2723 and group 0x1a56, but that's just
>> cosmetic anyway so it doesn't matter really in the end.
>>
>> As always, please do let me know if there any problems.
>
> Pulled, please double check my work.

I checked, your resolution is identical to my test resolution which I
made before sending you the pull request. Next time I'll push my
resolution to my tree so that you can immediately compare them.

Thanks!

--
Kalle Valo

\
 
 \ /
  Last update: 2019-04-19 05:58    [W:0.035 / U:4.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site