On Tue, Dec 24, 2019 at 06:16:39AM +0100, Jan Alexander Steffens (heftig) wrote: > Commit 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from > trans_pcie_alloc to probe") refactored the cfg mangling. Unfortunately, > in this process the lines which picked the right cfg for Killer Qu C0 > NICs after C0 detection were lost. These lines were added by commit > b9500577d361 ("iwlwifi: pcie: handle switching killer Qu B0 NICs to > C0"). > > I suspect this is more of the "merge damage" which commit 7cded5658329 > ("iwlwifi: pcie: fix merge damage on making QnJ exclusive") talks about. > > Restore the missing lines so the driver loads the right firmware for > these NICs. This seems real, as upgrading 5.5.0 -> 5.5.5 just broke my iwlwifi on XPS 7390. How come?