From: "Valo, Kalle" <kvalo@qca.qualcomm.com>
To: "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
Cc: David Miller <davem@davemloft.net>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: Re: pull request: iwlwifi 2016-04-12
Date: Thu, 21 Apr 2016 12:25:57 +0000 [thread overview]
Message-ID: <87mvoncfn0.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <87oa9borxv.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Fri, 15 Apr 2016 17:41:16 +0300")
Kalle Valo <kvalo@codeaurora.org> writes:
> "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> writes:
>
>> I have here a pull request for 4.6. There is patch in this pull request
>> that has been sent to -next already but should really have been
>> included in the current cycle. Sorry for the mess.
>>
>> The commit appears in -next as:
>>
>> commit a0b09f13036cedfd67c9cb4b9d05138e7022723d
>> Author: Ayala Beker <ayala.beker@intel.com>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: update GSCAN capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV.
>>
>> I modified the commit message to better emphasis the need to have it in
>> the current release. You'll see it in this pull request as:
>>
>> commit cd49727e1a2bccc4ff008dde24c2f8430dd9e368
>> Author: Ayala Beker <ayala.beker@intel.com>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: avoid to WARN about gscan capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV and avoid to WARN
>> if the firmware does not have the new capabilities.
>
> I feel uneasy having the same commit on both trees, but that might just
> me. Dave, how do you suggest to handle cases like this when we want to
> get a fix from -next to the current release -rc release?
Dave replied privately that this is ok. So I'll pull this shortly.
--
Kalle Valo
next prev parent reply other threads:[~2016-04-21 12:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-12 8:14 pull request: iwlwifi 2016-04-12 Grumbach, Emmanuel
2016-04-12 8:16 ` [PATCH 1/4] iwlwifi: add device IDs for the 8265 device Emmanuel Grumbach
2016-04-12 8:16 ` [PATCH 2/4] iwlwifi: mvm: avoid to WARN about gscan capabilities Emmanuel Grumbach
2016-04-12 8:16 ` [PATCH 3/4] iwlwifi: 8000: fix MODULE_FIRMWARE input Emmanuel Grumbach
2016-04-12 8:16 ` [PATCH 4/4] iwlwifi: mvm: fix accessing Null pointer during fw dump collection Emmanuel Grumbach
2016-04-12 8:59 ` pull request: iwlwifi 2016-04-12 Grumbach, Emmanuel
2016-04-21 12:41 ` Kalle Valo
2016-04-15 14:41 ` Kalle Valo
2016-04-21 12:25 ` Valo, Kalle [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-08-07 4:35 Grumbach, Emmanuel
2016-08-07 4:38 ` Emmanuel Grumbach
2016-08-15 8:14 ` Kalle Valo
2016-08-25 9:54 ` Luca Coelho
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=87mvoncfn0.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@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;
as well as URLs for NNTP newsgroup(s).