From: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Date: Mon, 18 Dec 2017 16:17:24 +0200
> a pull request for 4.16 to net-next tree. This is a big one, but on the
> other hand most of the stuff here has been some time on linux-next so
> hopefully there are no nasty surprises. Even though Arnd just send a
> patch[1] five minutes ago about fixing a wcn36xx build warning, but I
> don't think that's critical enough to hold up this, so I'll send it to
> you in the next pull request.
>
> But this time we actually have a merge conflict due to a000 hardware
> rename in iwlwifi:
>
> CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> The fix is quite straightforward, take the 22000 versions and manually
> add an entry for 0xA0F0 device:
>
> {IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl22000_2ax_cfg_hr)},
>
> I put the 'git diff' output of my test resolution below, hopefully it
> helps. I'll also Cc Luca so he can correct any mistakes I did :)
>
> Please let me know if you have any problems.
Pulled, and thanks for the resolution diff. It helped a lot.
