Re: [PATCH] iwlwifi: pcie: restore support for Killer Qu C0 NICs

Kalle Valo
2020-03-03T15:29:48Z

"Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> 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@gmail.com>

As Luca said, this fails to apply to wireless-drivers. Please rebase and
resend as v2.

Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/pcie/drv.c'
error: Failed to merge in the changes.
Applying: iwlwifi: pcie: restore support for Killer Qu C0 NICs
Using index info to reconstruct a base tree...
M drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Patch failed at 0001 iwlwifi: pcie: restore support for Killer Qu C0 NICs
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

--