From: "John W. Linville" <linville@tuxdriver.com>
To: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: Jakub Kicinski <kubakici@wp.pl>,
linux-wireless <linux-wireless@vger.kernel.org>,
Felix Fietkau <nbd@openwrt.org>
Subject: Re: Incorrect resolution of merge conflict in net/mac80211/iface.c
Date: Wed, 5 Jun 2013 13:45:38 -0400 [thread overview]
Message-ID: <20130605174537.GA15004@tuxdriver.com> (raw)
In-Reply-To: <CAGXE3d_TRYRA-o0K+zL-76rp0Xsv98bQnOPRJVepAP+iogrsTg@mail.gmail.com>
On Wed, Jun 05, 2013 at 04:37:21PM +0200, Helmut Schaa wrote:
> On Wed, Jun 5, 2013 at 4:14 PM, Jakub Kicinski <kubakici@wp.pl> wrote:
> > Hi John,
> >
> > I'm afraid merge in commit 84e46e17c8 of wireless-testing is
> > not correct. I don't know how would you like to resolve this
> > technical error, I attach my fixup patch in case it will help
> > you. You may also want to take a look at commit a0f5d4b3a3
> > of linux-next, I believe Stephen have merged two offending
> > patches correctly there.
> >
> > BTW I think the way MAC addresses of active monitors are
> > handled for devices that use address masks need some work
> > on its own I hope to send a fix for that later this week.
>
> Indeed, good catch. Stephens merge looks correct to me.
Yep, looks fine -- thanks, Jakub!
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
prev parent reply other threads:[~2013-06-06 13:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20130605161445.309a2942@north>
2013-06-05 14:37 ` Incorrect resolution of merge conflict in net/mac80211/iface.c Helmut Schaa
2013-06-05 17:45 ` John W. Linville [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=20130605174537.GA15004@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=helmut.schaa@googlemail.com \
--cc=kubakici@wp.pl \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@openwrt.org \
/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.