Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support
From:   Kalle Valo <kvalo@kernel.org>
In-Reply-To: <20230123090555.21415-1-git@qrsnap.io>
References: <20230123090555.21415-1-git@qrsnap.io>
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
User-Agent: pwcli/0.1.1-git (https://github.com/kvalo/pwcli/) Python/3.7.3
Message-ID: <167950811348.23855.15517111358348733076.kvalo@kernel.org>
Date:   Wed, 22 Mar 2023 18:01:57 +0000 (UTC)
Precedence: bulk

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