From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Date: Mon, 07 Aug 2017 17:55:40 +0300 > here's the first pull request to net-next for 4.14, more info in the > signed tag below. This time there's a simple conflict in iwlwifi but > you can fix it just like Stephen did: > > https://lkml.kernel.org/r/20170804120408.0d147e86@xxxxxxxxxxxxxxxx > > Please let me know if you have any problems. Pulled, thanks Kalle.