From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Date: Thu, 26 Mar 2020 08:19:43 +0200 > David Miller <davem@xxxxxxxxxxxxx> writes: > >> From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> >> Date: Wed, 25 Mar 2020 19:57:54 +0000 (UTC) >> >>> here's a pull request to net tree, more info below. Please let me know if there >>> are any problems. >> >> Pulled, thanks Kalle. > > Thanks. I forgot to remind in this pull request about the iwlwifi > conflict when you merge net to net-next. Here are the instructions how > to handle that: > > To solve that just drop the changes from commit cf52c8a776d1 in > wireless-drivers and take the hunk from wireless-drivers-next as is. > The list of specific subsystem device IDs are not necessary after > commit d6f2134a3831 (in wireless-drivers-next) anymore, the detection > is based on other characteristics of the devices. > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=5ef8c665416b9815113042e0edebe8ff66a45e2e I think that's what I did basically, please go take a look and double check my work. Thank you!
