From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752388AbcGGFtU (ORCPT ); Thu, 7 Jul 2016 01:49:20 -0400 Received: from mga03.intel.com ([134.134.136.65]:28494 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbcGGFtT (ORCPT ); Thu, 7 Jul 2016 01:49:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,323,1464678000"; d="scan'208";a="1017098978" From: "Coelho, Luciano" To: "sfr@canb.auug.org.au" , "kvalo@codeaurora.org" , "johannes@sipsolutions.net" CC: "Krauss, Assaf" , "linux-kernel@vger.kernel.org" , "huxm@marvell.com" , "Stern, Avraham" , "linux-next@vger.kernel.org" , "Spinadel, David" , "akarwar@marvell.com" Subject: Re: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree Thread-Topic: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree Thread-Index: AQHR1/LSCM6ie6e8hkusGArdVRstMqAMZeIA Date: Thu, 7 Jul 2016 05:49:09 +0000 Message-ID: <1467870546.25088.43.camel@intel.com> References: <20160707115628.7fdac327@canb.auug.org.au> In-Reply-To: <20160707115628.7fdac327@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.252.0.122] Content-Type: text/plain; charset="utf-8" Content-ID: <9ED47F929AC4A54789CD8C06EDC43FA0@intel.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u675nav7029308 On Thu, 2016-07-07 at 11:56 +1000, Stephen Rothwell wrote: > Hi Johannes, > > Today's linux-next merge of the mac80211-next tree got a conflict in: > >   drivers/net/wireless/marvell/mwifiex/cmdevt.c > > between commit: > >   a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan") > > from the wireless-drivers-next tree and commit: > >   1d76250bd34a ("nl80211: support beacon report scanning") > > from the mac80211-next tree. > > I fixed it up (I used the wireless-drivers-next tree version of this > file > and then added the following merge fix patch) and can carry the fix > as > necessary. This is now fixed as far as linux-next is concerned, but > any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging.  You may also want to > consider > cooperating with the maintainer of the conflicting tree to minimise > any > particularly complex conflicts. > > From: Stephen Rothwell > Date: Thu, 7 Jul 2016 11:51:35 +1000 > Subject: [PATCH] mwifiex: fixup for "nl80211: support beacon report > scanning" > > Signed-off-by: Stephen Rothwell > --- >  drivers/net/wireless/marvell/mwifiex/scan.c | 6 +++++- >  1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c > b/drivers/net/wireless/marvell/mwifiex/scan.c > index 4d21ca9744c1..ed3de0754a08 100644 > --- a/drivers/net/wireless/marvell/mwifiex/scan.c > +++ b/drivers/net/wireless/marvell/mwifiex/scan.c > @@ -2026,9 +2026,13 @@ void mwifiex_cancel_scan(struct > mwifiex_adapter *adapter) >   if (!priv) >   continue; >   if (priv->scan_request) { > + struct cfg80211_scan_info info = { > + .aborted = true, > + }; > + >   mwifiex_dbg(adapter, INFO, >       "info: aborting > scan\n"); > - cfg80211_scan_done(priv- > >scan_request, 1); > + cfg80211_scan_done(priv- > >scan_request, &info); >   priv->scan_request = NULL; >   } >   } The fix looks good to me.  Thanks! -- Luca.