From: Kalle Valo <kvalo@kernel.org>
To: Reese Russell <git@qrsnap.io>
Cc: git@qrsnap.io, Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo@kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Shayne Chen <shayne.chen@mediatek.com>,
Sean Wang <sean.wang@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Deren Wu <deren.wu@mediatek.com>, YN Chen <YN.Chen@mediatek.com>,
Ben Greear <greearb@candelatech.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support
Date: Wed, 22 Mar 2023 18:01:57 +0000 (UTC) [thread overview]
Message-ID: <167950811348.23855.15517111358348733076.kvalo@kernel.org> (raw)
In-Reply-To: <20230123090555.21415-1-git@qrsnap.io>
Reese Russell <git@qrsnap.io> wrote:
> Add support for the Netgear AXE3000 (A8000) based on the Mediatek
> mt7921au chipset. A retail sample of the Netgear AXE3000 (A8000) yeilds
> the following from lsusb D 0846:9060 NetGear, Inc. Wireless_Device. This
> has been reported by other users on Github.
>
> Signed-off-by: Reese Russell <git@qrsnap.io>
There was a conflict, please rebase over wireless and resubmit as v2:
Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7921/usb.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support
Using index info to reconstruct a base tree...
M drivers/net/wireless/mediatek/mt76/mt7921/usb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/mediatek/mt76/mt7921/usb.c
CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7921/usb.c
Patch failed at 0001 wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support
Patch set to Changes Requested.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230123090555.21415-1-git@qrsnap.io/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2023-03-22 18:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 9:05 [PATCH] Added Netgear AXE3000 (A8000) usb_device_id to mt7921u_device_table[] Reese Russell
2023-03-17 19:49 ` Nick Morrow
2023-03-18 7:06 ` Kalle Valo
2023-03-22 18:01 ` Kalle Valo [this message]
[not found] ` <CA+KKcbm9qy2yAjVZptTEQa7Z3UALcVbD2GbeHNrYufM6cfvZuw@mail.gmail.com>
2023-03-23 5:31 ` help with Qualcomm QCA6696 Kalle Valo
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=167950811348.23855.15517111358348733076.kvalo@kernel.org \
--to=kvalo@kernel.org \
--cc=YN.Chen@mediatek.com \
--cc=davem@davemloft.net \
--cc=deren.wu@mediatek.com \
--cc=edumazet@google.com \
--cc=git@qrsnap.io \
--cc=greearb@candelatech.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shayne.chen@mediatek.com \
/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
all inboxes | Powered by JetHome®