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@xxxxxxxxxxxxxxxxxxx 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 <luciano.coelho@xxxxxxxxx> |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 <luciano.coelho@xxxxxxxxx> | |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 <luciano.coelho@xxxxxxxxx> |Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> |Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> | |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 :( -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html