From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: "Coelho, Luciano" <luciano.coelho@intel.com>
Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
Subject: Re: FAILED: patch "[PATCH] iwlwifi: mvm: don't allow sched scans without matches to be" failed to apply to 4.4-stable tree
Date: Tue, 01 Mar 2016 20:02:46 +0000 [thread overview]
Message-ID: <20160301200245.GA11127@kroah.com> (raw)
In-Reply-To: <1456861934.28365.18.camel@intel.com>
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 <luciano.coelho@intel.com>
|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@intel.com>
|
|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@intel.com>
|Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|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 :(
next prev parent reply other threads:[~2016-03-01 20:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 18:45 FAILED: patch "[PATCH] iwlwifi: mvm: don't allow sched scans without matches to be" failed to apply to 4.4-stable tree gregkh
2016-03-01 19:27 ` Coelho, Luciano
2016-03-01 19:42 ` gregkh
2016-03-01 19:45 ` Coelho, Luciano
2016-03-01 19:52 ` Coelho, Luciano
2016-03-01 20:02 ` gregkh [this message]
2016-03-01 20:07 ` Coelho, Luciano
2016-03-01 20:11 ` gregkh
2016-03-01 20:19 ` Grumbach, Emmanuel
2016-03-01 20:23 ` Coelho, Luciano
2016-03-01 20:24 ` gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160301200245.GA11127@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=emmanuel.grumbach@intel.com \
--cc=luciano.coelho@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox