From: Kalle Valo <kvalo@codeaurora.org>
To: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Cc: Johannes Berg <johannes.berg@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Luca Coelho <luciano.coelho@intel.com>,
Intel Linux Wireless <linuxwifi@intel.com>,
"David S. Miller" <davem@davemloft.net>,
"Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Date: Tue, 3 Mar 2020 15:29:25 +0000 (UTC) [thread overview]
Message-ID: <20200303152925.4C552C4479C@smtp.codeaurora.org> (raw)
In-Reply-To: <20191224051639.6904-1-jan.steffens@gmail.com>
"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.
--
https://patchwork.kernel.org/patch/11309095/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2020-03-03 15:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 5:16 [PATCH] iwlwifi: pcie: restore support for Killer Qu C0 NICs Jan Alexander Steffens (heftig)
2020-02-21 12:11 ` Leho Kraav
2020-03-03 5:40 ` Kalle Valo
2020-03-03 8:17 ` Luca Coelho
2020-03-03 15:29 ` Kalle Valo [this message]
[not found] ` <20200303152925.6BCA8C4479F@smtp.codeaurora.org>
2020-03-04 7:10 ` Luciano Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200303152925.4C552C4479C@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=jan.steffens@gmail.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).