On Tue, 2016-04-12 at 11:14 +0300, Emmanuel Grumbach wrote: > Hi Kalle, > > 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@xxxxxxxxx> > 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@xxxxxxxxx> > 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. > > Besides this, all is fairly normal. > Please pull, thanks! > > > The following changes since commit > 7fdf9663261cc77a516396fec82cee8a8ea07e76: > > iwlwifi: mvm: fix memory leak in paging (2016-03-20 23:01:54 +0200) > > are available in the git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fix > es.git tags/iwlwifi-for-kalle-2016-04-12 > > for you to fetch changes up to > 2d25fb8b3a138706b63bd26ad72a95c58029954a: > > iwlwifi: mvm: fix accessing Null pointer during fw dump collection > (2016-04-12 10:03:17 +0300) > Sara found an embarrassing last minute issue. New tag is iwlwifi-for-kalle-2016-04-12_2. Here is the diff: diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c index cf48122..b5c57ee 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c @@ -93,7 +93,7 @@ #define IWL8260_SMEM_OFFSET 0x400000 #define IWL8260_SMEM_LEN 0x68000 -#define IWL8000_FW_PRE "iwlwifi-8000C" +#define IWL8000_FW_PRE "iwlwifi-8000C-" #define IWL8000_MODULE_FIRMWARE(api) \ IWL8000_FW_PRE "-" __stringify(api) ".ucode" > ---------------------------------------------------------------- > * add new device IDs for 8265 > * fix a NULL pointer dereference when paging firmware asserts > * remove a WARNING on gscan capabilities > * fix MODULE_FIRMWARE for 8260 > > ---------------------------------------------------------------- > Ayala Beker (1): > iwlwifi: mvm: avoid to WARN about gscan capabilities > > Matti Gottlieb (1): > iwlwifi: mvm: fix accessing Null pointer during fw dump > collection > > Oren Givon (1): > iwlwifi: add device IDs for the 8265 device > > Sara Sharon (1): > iwlwifi: 8000: fix MODULE_FIRMWARE input > > drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +- > drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 26 ++++++++++----- > ----------- > drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 ++++-- > drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 ++ > drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 ++++++++++ > 5 files changed, 27 insertions(+), 19 deletions(-)��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
