2013-06-05 14:37:24

by Helmut Schaa

[permalink] [raw]
Subject: Re: Incorrect resolution of merge conflict in net/mac80211/iface.c

On Wed, Jun 5, 2013 at 4:14 PM, Jakub Kicinski <[email protected]> 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.
Helmut


2013-06-06 13:15:11

by John W. Linville

[permalink] [raw]
Subject: Re: Incorrect resolution of merge conflict in net/mac80211/iface.c

On Wed, Jun 05, 2013 at 04:37:21PM +0200, Helmut Schaa wrote:
> On Wed, Jun 5, 2013 at 4:14 PM, Jakub Kicinski <[email protected]> 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
[email protected] might be all we have. Be ready.