On Tue, 2020-03-03 at 15:29 +0000, Kalle Valo wrote:
> "Jan Alexander Steffens (heftig)" <jan.steffens@xxxxxxxxx> 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.
> >
> > Fixes: 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe")
> > Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@xxxxxxxxx>
>
> As Luca said, this fails to apply to wireless-drivers. Please rebase and
> resend as v2.
Hmmm, sorry, I confused things a bit. I missed the fact that wireless-
drivers is already at v5.6.
This patch is not needed in v5.6-rc* because another patch has done a
similar change. There was some refactoring in this area, so the patch
that is in v5.6 doesn't apply in v5.5, so Jan's patch has to be sent to
stable v5.5 and not be applied in wireless-drivers.
Jan, if you want this to be fixed in v5.5, can you please send it to
stable@xxxxxxxxxxxxxxx with an explanation of why it has to be there
even though it's not in the mainline? Or just send it and CC me, so
I'll reply with an explanation of the issue.
--
Cheers,
Luca.
