Daniel Golle <daniel@xxxxxxxxxxxxxx> wrote: > From: Roman Yeryomin <roman@xxxxxxxx> > > Basic support for MT7620 built-in wireless radio was added to > OpenWrt in r41441. It has seen some heavy cleaning and refactoring > since in order to match the Kernel's code quality standards. > > Signed-off-by: Roman Yeryomin <roman@xxxxxxxx> > Signed-off-by: Daniel Golle <daniel@xxxxxxxxxxxxxx> > Acked-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx> Failed to apply even if I had the dependency patch already applied: error: Failed to merge in the changes. Applying: rt2x00: add support for MT7620 Using index info to reconstruct a base tree... M drivers/net/wireless/ralink/rt2x00/rt2800.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800.h CONFLICT (content): Merge conflict in drivers/net/wireless/ralink/rt2x00/rt2800.h Patch failed at 0001 rt2x00: add support for MT7620 The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested. -- https://patchwork.kernel.org/patch/9618995/ Documentation about submitting wireless patches and checking status from patchwork: https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
