Re: pull-request: wireless-drivers-next 2019-04-18

[David Miller]

From: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx
> 
> https://lkml.kernel.org/r/20190415120853.39e0e46a@xxxxxxxxxxxxxxxx
> 
> 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.