From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:58841 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbcCAULK convert rfc822-to-8bit (ORCPT ); Tue, 1 Mar 2016 15:11:10 -0500 Received: from pmta03.dal05.mailchimp.com (127.0.0.1) by mail333.us4.mandrillapp.com id hqnrls174no3 for ; Tue, 1 Mar 2016 20:11:10 +0000 (envelope-from ) From: "gregkh@linuxfoundation.org" Subject: Re: FAILED: patch "[PATCH] iwlwifi: mvm: don't allow sched scans without matches to be" failed to apply to 4.4-stable tree To: "Coelho, Luciano" Cc: "stable@vger.kernel.org" , "Grumbach, Emmanuel" Message-Id: <20160301201108.GA18275@kroah.com> References: <145685795842149@kroah.com> <1456860461.28365.15.camel@intel.com> <20160301194204.GA1994@kroah.com> <1456861500.28365.16.camel@intel.com> <1456861934.28365.18.camel@intel.com> <20160301200245.GA11127@kroah.com> <1456862821.28365.26.camel@intel.com> In-Reply-To: <1456862821.28365.26.camel@intel.com> Date: Tue, 01 Mar 2016 20:11:10 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Tue, Mar 01, 2016 at 08:07:02PM +0000, Coelho, Luciano wrote: > On Tue, 2016-03-01 at 20:02 +0000, gregkh@linuxfoundation.org wrote: > > On Tue, Mar 01, 2016 at 07:52:14PM +0000, Coelho, Luciano wrote: > > > On Tue, 2016-03-01 at 21:45 +0200, Coelho, Luciano wrote: > > > > On Tue, 2016-03-01 at 19:42 +0000, gregkh@linuxfoundation.org > > > > wrote: > > > > > On Tue, Mar 01, 2016 at 07:27:41PM +0000, Coelho, Luciano > > > > > wrote: > > > > > > Hi Greg, > > > > > > > > > > > > This is strange... I just tried to cherry-pick it on top of > > > > > > 4.4.3 > > > > > > and > > > > > > it applied cleanly. > > > > > > > > > > I think it breaks the build, can you try to test build it as > > > > > well? > > > > > > > > Sure, I'm building it right now. > > > > > > Tried to do everything again, from scratch.  The patch applied > > > cleanly > > > and the iwlwifi driver built without any problems. > > > > > > Pastebin of the output here: > > > > > > http://pastebin.coelho.fi/cc3fd7dd9016d944.txt > > > > Ah, I can't use cherry-pick: > > > > $ patch -p1 < ../iwlwifi-mvm-don-t-allow-sched-scans-without-matches- > > to-be-started.patch  > > can't find file to patch at input line 26 > > Perhaps you used the wrong -p or --strip option? > > The text leading up to this was: > > -------------------------- > > > From 5e56276e7555b34550d51459a801ff75eca8b907 Mon Sep 17 00:00:00 > > > 2001 > > > From: Luca Coelho > > > Date: Tue, 2 Feb 2016 15:11:15 +0200 > > > Subject: iwlwifi: mvm: don't allow sched scans without matches to > > > be started > > > > > > From: Luca Coelho > > > > > > commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream. > > > > > > The firmware can perform a scheduled scan with not matchsets > > > passed, > > > but it can't send notification that results were found.  Since the > > > userspace then cannot know when we got new results and the firmware > > > wouldn't trigger a wake in case we are sleeping, it's better not to > > > allow scans without matchsets. > > > > > > This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831 > > > > > > Signed-off-by: Luca Coelho > > > Signed-off-by: Emmanuel Grumbach > > > Signed-off-by: Greg Kroah-Hartman > > > > > > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c > > > b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c > > > index 9a15642f80dd..ea1e177c2ea1 100644 > > > --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c > > > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c > > -------------------------- > > File to patch:  > > > > > > That's the issue, things got renamed :( > > Ah, okay, I should have realized that, sorry. > > I thought you were using at least 'git am -3' or something to let git > do its tricks on these minor issues.  I'll send the new patch for 4.4 > right away (since I already have it after all). :) I use quilt, not git until I apply the patches when the tree is released. thanks, greg k-h