On Wed, Jun 5, 2013 at 4:14 PM, Jakub Kicinski <kubakici@xxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html