From: Kalle Valo <kvalo@codeaurora.org>
To: Daniel Golle <daniel@makrotopia.org>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>,
Helmut Schaa <helmut.schaa@googlemail.com>,
linux-wireless@vger.kernel.org
Subject: Re: rt2x00: add support for MT7620
Date: Mon, 20 Mar 2017 17:20:50 +0000 (UTC) [thread overview]
Message-ID: <20170320172050.E166F60EA5@smtp.codeaurora.org> (raw)
In-Reply-To: <20170311193011.GA6809@makrotopia.org>
Daniel Golle <daniel@makrotopia.org> wrote:
> From: Roman Yeryomin <roman@advem.lv>
>
> 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@advem.lv>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
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
prev parent reply other threads:[~2017-03-20 17:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 12:32 [PATCH] mac80211: rt2x00: add support for MT7620 Daniel Golle
2017-03-11 10:37 ` Stanislaw Gruszka
2017-03-11 19:30 ` Daniel Golle
2017-03-11 20:30 ` Daniel Golle
2017-03-14 10:36 ` Stanislaw Gruszka
2017-03-16 8:01 ` Kalle Valo
[not found] ` <20170316080104.4949C60DA6@smtp.codeaurora.org>
2017-03-19 6:02 ` Daniel Golle
2017-03-20 17:20 ` Kalle Valo [this message]
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=20170320172050.E166F60EA5@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=daniel@makrotopia.org \
--cc=helmut.schaa@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=sgruszka@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.