Reese Russell <git@xxxxxxxxx> 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@xxxxxxxxx> 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@xxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
