* Re: Incorrect resolution of merge conflict in net/mac80211/iface.c [not found] <20130605161445.309a2942@north> @ 2013-06-05 14:37 ` Helmut Schaa 2013-06-05 17:45 ` John W. Linville 0 siblings, 1 reply; 2+ messages in thread From: Helmut Schaa @ 2013-06-05 14:37 UTC (permalink / raw) To: Jakub Kicinski; +Cc: John W. Linville, linux-wireless, Felix Fietkau 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. Helmut ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Incorrect resolution of merge conflict in net/mac80211/iface.c 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 0 siblings, 0 replies; 2+ messages in thread From: John W. Linville @ 2013-06-05 17:45 UTC (permalink / raw) To: Helmut Schaa; +Cc: Jakub Kicinski, linux-wireless, Felix Fietkau 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. ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-06 13:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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 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.