* pull request: iwlwifi 2016-04-12
@ 2016-04-12 8:14 Grumbach, Emmanuel
2016-04-12 8:59 ` Grumbach, Emmanuel
2016-04-15 14:41 ` Kalle Valo
0 siblings, 2 replies; 9+ messages in thread
From: Grumbach, Emmanuel @ 2016-04-12 8:14 UTC (permalink / raw)
To: kvalo@codeaurora.org; +Cc: linux-wireless@vger.kernel.org
SGkgS2FsbGUsDQoNCkkgaGF2ZSBoZXJlIGEgcHVsbCByZXF1ZXN0IGZvciA0LjYuIFRoZXJlIGlz
IHBhdGNoIGluIHRoaXMgcHVsbCByZXF1ZXN0DQp0aGF0IGhhcyBiZWVuIHNlbnQgdG8gLW5leHQg
YWxyZWFkeSBidXQgc2hvdWxkIHJlYWxseSBoYXZlIGJlZW4NCmluY2x1ZGVkIGluIHRoZSBjdXJy
ZW50IGN5Y2xlLiBTb3JyeSBmb3IgdGhlIG1lc3MuDQoNClRoZSBjb21taXQgYXBwZWFycyBpbiAt
bmV4dCBhczoNCg0KY29tbWl0IGEwYjA5ZjEzMDM2Y2VkZmQ2N2M5Y2I0YjlkMDUxMzhlNzAyMjcy
M2QNCkF1dGhvcjogQXlhbGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCkRhdGU6ICAg
V2VkIEZlYiAzIDE1OjM2OjUyIDIwMTYgKzAyMDANCg0KICAgIGl3bHdpZmk6IG12bTogdXBkYXRl
IEdTQ0FOIGNhcGFiaWxpdGllcw0KICAgIA0KICAgIEdzY2FuIGNhcGFiaWxpdGllcyB3ZXJlIHVw
ZGF0ZWQgd2l0aCBuZXcgY2FwYWJpbGl0aWVzIHN1cHBvcnRlZA0KICAgIGJ5IHRoZSBkZXZpY2Uu
IFVwZGF0ZSBHU0NBTiBjYXBhYmlsaXRpZXMgVExWLg0KDQpJIG1vZGlmaWVkIHRoZSBjb21taXQg
bWVzc2FnZSB0byBiZXR0ZXIgZW1waGFzaXMgdGhlIG5lZWQgdG8gaGF2ZSBpdCBpbg0KdGhlIGN1
cnJlbnQgcmVsZWFzZS4gWW91J2xsIHNlZSBpdCBpbiB0aGlzIHB1bGwgcmVxdWVzdCBhczoNCg0K
Y29tbWl0IGNkNDk3MjdlMWEyYmNjYzRmZjAwOGRkZTI0YzJmODQzMGRkOWUzNjgNCkF1dGhvcjog
QXlhbGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCkRhdGU6ICAgV2VkIEZlYiAzIDE1
OjM2OjUyIDIwMTYgKzAyMDANCg0KICAgIGl3bHdpZmk6IG12bTogYXZvaWQgdG8gV0FSTiBhYm91
dCBnc2NhbiBjYXBhYmlsaXRpZXMNCiAgICANCiAgICBHc2NhbiBjYXBhYmlsaXRpZXMgd2VyZSB1
cGRhdGVkIHdpdGggbmV3IGNhcGFiaWxpdGllcyBzdXBwb3J0ZWQNCiAgICBieSB0aGUgZGV2aWNl
LiBVcGRhdGUgR1NDQU4gY2FwYWJpbGl0aWVzIFRMViBhbmQgYXZvaWQgdG8gV0FSTg0KICAgIGlm
IHRoZSBmaXJtd2FyZSBkb2VzIG5vdCBoYXZlIHRoZSBuZXcgY2FwYWJpbGl0aWVzLg0KDQpCZXNp
ZGVzIHRoaXMsIGFsbCBpcyBmYWlybHkgbm9ybWFsLg0KUGxlYXNlIHB1bGwsIHRoYW5rcyENCg0K
DQpUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29tbWl0IDdmZGY5NjYzMjYxY2M3N2E1MTYz
OTZmZWM4MmNlZThhOGVhMDdlNzY6DQoNCiAgaXdsd2lmaTogbXZtOiBmaXggbWVtb3J5IGxlYWsg
aW4gcGFnaW5nICgyMDE2LTAzLTIwIDIzOjAxOjU0ICswMjAwKQ0KDQphcmUgYXZhaWxhYmxlIGlu
IHRoZSBnaXQgcmVwb3NpdG9yeSBhdDoNCg0KICBodHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9z
Y20vbGludXgva2VybmVsL2dpdC9pd2x3aWZpL2l3bHdpZmktZml4ZXMuZ2l0IHRhZ3MvaXdsd2lm
aS1mb3Ita2FsbGUtMjAxNi0wNC0xMg0KDQpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMgdXAgdG8g
MmQyNWZiOGIzYTEzODcwNmI2M2JkMjZhZDcyYTk1YzU4MDI5OTU0YToNCg0KICBpd2x3aWZpOiBt
dm06IGZpeCBhY2Nlc3NpbmcgTnVsbCBwb2ludGVyIGR1cmluZyBmdyBkdW1wIGNvbGxlY3Rpb24g
KDIwMTYtMDQtMTIgMTA6MDM6MTcgKzAzMDApDQoNCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiogYWRkIG5ldyBkZXZpY2Ug
SURzIGZvciA4MjY1DQoqIGZpeCBhIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZSB3aGVuIHBhZ2lu
ZyBmaXJtd2FyZSBhc3NlcnRzDQoqIHJlbW92ZSBhIFdBUk5JTkcgb24gZ3NjYW4gY2FwYWJpbGl0
aWVzDQoqIGZpeCBNT0RVTEVfRklSTVdBUkUgZm9yIDgyNjANCg0KLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQXlhbGEgQmVr
ZXIgKDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBhdm9pZCB0byBXQVJOIGFib3V0IGdzY2FuIGNh
cGFiaWxpdGllcw0KDQpNYXR0aSBHb3R0bGllYiAoMSk6DQogICAgICBpd2x3aWZpOiBtdm06IGZp
eCBhY2Nlc3NpbmcgTnVsbCBwb2ludGVyIGR1cmluZyBmdyBkdW1wIGNvbGxlY3Rpb24NCg0KT3Jl
biBHaXZvbiAoMSk6DQogICAgICBpd2x3aWZpOiBhZGQgZGV2aWNlIElEcyBmb3IgdGhlIDgyNjUg
ZGV2aWNlDQoNClNhcmEgU2hhcm9uICgxKToNCiAgICAgIGl3bHdpZmk6IDgwMDA6IGZpeCBNT0RV
TEVfRklSTVdBUkUgaW5wdXQNCg0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkv
aXdsLTgwMDAuYyAgIHwgIDIgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp
L2l3bC1kcnYuYyAgICB8IDI2ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tDQogZHJpdmVycy9u
ZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vZnctZGJnLmMgfCAgNiArKysrLS0NCiBkcml2
ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZpL212bS9mdy5jICAgICB8ICAyICsrDQogZHJp
dmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9wY2llL2Rydi5jICAgfCAxMCArKysrKysr
KysrDQogNSBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSk=
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-04-12 8:14 Grumbach, Emmanuel
@ 2016-04-12 8:59 ` Grumbach, Emmanuel
2016-04-21 12:41 ` Kalle Valo
2016-04-15 14:41 ` Kalle Valo
1 sibling, 1 reply; 9+ messages in thread
From: Grumbach, Emmanuel @ 2016-04-12 8:59 UTC (permalink / raw)
To: kvalo@codeaurora.org; +Cc: linux-wireless@vger.kernel.org
T24gVHVlLCAyMDE2LTA0LTEyIGF0IDExOjE0ICswMzAwLCBFbW1hbnVlbCBHcnVtYmFjaCB3cm90
ZToNCj4gSGkgS2FsbGUsDQo+IA0KPiBJIGhhdmUgaGVyZSBhIHB1bGwgcmVxdWVzdCBmb3IgNC42
LiBUaGVyZSBpcyBwYXRjaCBpbiB0aGlzIHB1bGwNCj4gcmVxdWVzdA0KPiB0aGF0IGhhcyBiZWVu
IHNlbnQgdG8gLW5leHQgYWxyZWFkeSBidXQgc2hvdWxkIHJlYWxseSBoYXZlIGJlZW4NCj4gaW5j
bHVkZWQgaW4gdGhlIGN1cnJlbnQgY3ljbGUuIFNvcnJ5IGZvciB0aGUgbWVzcy4NCj4gDQo+IFRo
ZSBjb21taXQgYXBwZWFycyBpbiAtbmV4dCBhczoNCj4gDQo+IGNvbW1pdCBhMGIwOWYxMzAzNmNl
ZGZkNjdjOWNiNGI5ZDA1MTM4ZTcwMjI3MjNkDQo+IEF1dGhvcjogQXlhbGEgQmVrZXIgPGF5YWxh
LmJla2VyQGludGVsLmNvbT4NCj4gRGF0ZTogICBXZWQgRmViIDMgMTU6MzY6NTIgMjAxNiArMDIw
MA0KPiANCj4gICAgIGl3bHdpZmk6IG12bTogdXBkYXRlIEdTQ0FOIGNhcGFiaWxpdGllcw0KPiAg
ICAgDQo+ICAgICBHc2NhbiBjYXBhYmlsaXRpZXMgd2VyZSB1cGRhdGVkIHdpdGggbmV3IGNhcGFi
aWxpdGllcyBzdXBwb3J0ZWQNCj4gICAgIGJ5IHRoZSBkZXZpY2UuIFVwZGF0ZSBHU0NBTiBjYXBh
YmlsaXRpZXMgVExWLg0KPiANCj4gSSBtb2RpZmllZCB0aGUgY29tbWl0IG1lc3NhZ2UgdG8gYmV0
dGVyIGVtcGhhc2lzIHRoZSBuZWVkIHRvIGhhdmUgaXQNCj4gaW4NCj4gdGhlIGN1cnJlbnQgcmVs
ZWFzZS4gWW91J2xsIHNlZSBpdCBpbiB0aGlzIHB1bGwgcmVxdWVzdCBhczoNCj4gDQo+IGNvbW1p
dCBjZDQ5NzI3ZTFhMmJjY2M0ZmYwMDhkZGUyNGMyZjg0MzBkZDllMzY4DQo+IEF1dGhvcjogQXlh
bGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCj4gRGF0ZTogICBXZWQgRmViIDMgMTU6
MzY6NTIgMjAxNiArMDIwMA0KPiANCj4gICAgIGl3bHdpZmk6IG12bTogYXZvaWQgdG8gV0FSTiBh
Ym91dCBnc2NhbiBjYXBhYmlsaXRpZXMNCj4gICAgIA0KPiAgICAgR3NjYW4gY2FwYWJpbGl0aWVz
IHdlcmUgdXBkYXRlZCB3aXRoIG5ldyBjYXBhYmlsaXRpZXMgc3VwcG9ydGVkDQo+ICAgICBieSB0
aGUgZGV2aWNlLiBVcGRhdGUgR1NDQU4gY2FwYWJpbGl0aWVzIFRMViBhbmQgYXZvaWQgdG8gV0FS
Tg0KPiAgICAgaWYgdGhlIGZpcm13YXJlIGRvZXMgbm90IGhhdmUgdGhlIG5ldyBjYXBhYmlsaXRp
ZXMuDQo+IA0KPiBCZXNpZGVzIHRoaXMsIGFsbCBpcyBmYWlybHkgbm9ybWFsLg0KPiBQbGVhc2Ug
cHVsbCwgdGhhbmtzIQ0KPiANCj4gDQo+IFRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21t
aXQNCj4gN2ZkZjk2NjMyNjFjYzc3YTUxNjM5NmZlYzgyY2VlOGE4ZWEwN2U3NjoNCj4gDQo+ICAg
aXdsd2lmaTogbXZtOiBmaXggbWVtb3J5IGxlYWsgaW4gcGFnaW5nICgyMDE2LTAzLTIwIDIzOjAx
OjU0ICswMjAwKQ0KPiANCj4gYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6
DQo+IA0KPiAgIGh0dHBzOi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9rZXJuZWwvZ2l0
L2l3bHdpZmkvaXdsd2lmaS1maXgNCj4gZXMuZ2l0IHRhZ3MvaXdsd2lmaS1mb3Ita2FsbGUtMjAx
Ni0wNC0xMg0KPiANCj4gZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvDQo+IDJkMjVmYjhi
M2ExMzg3MDZiNjNiZDI2YWQ3MmE5NWM1ODAyOTk1NGE6DQo+IA0KPiAgIGl3bHdpZmk6IG12bTog
Zml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIgZHVyaW5nIGZ3IGR1bXAgY29sbGVjdGlvbg0KPiAo
MjAxNi0wNC0xMiAxMDowMzoxNyArMDMwMCkNCj4gDQoNClNhcmEgZm91bmQgYW4gZW1iYXJyYXNz
aW5nIGxhc3QgbWludXRlIGlzc3VlLg0KTmV3IHRhZyBpcyBpd2x3aWZpLWZvci1rYWxsZS0yMDE2
LTA0LTEyXzIuDQogDQpIZXJlIGlzIHRoZSBkaWZmOg0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0
L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYw0KaW5kZXggY2Y0ODEyMi4uYjVjNTdlZSAxMDA2NDQN
Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYw0KKysr
IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9pd2wtODAwMC5jDQpAQCAtOTMs
NyArOTMsNyBAQA0KICNkZWZpbmUgSVdMODI2MF9TTUVNX09GRlNFVCAgICAgICAgICAgIDB4NDAw
MDAwDQogI2RlZmluZSBJV0w4MjYwX1NNRU1fTEVOICAgICAgICAgICAgICAgMHg2ODAwMA0KIA0K
LSNkZWZpbmUgSVdMODAwMF9GV19QUkUgIml3bHdpZmktODAwMEMiDQorI2RlZmluZSBJV0w4MDAw
X0ZXX1BSRSAiaXdsd2lmaS04MDAwQy0iDQogI2RlZmluZSBJV0w4MDAwX01PRFVMRV9GSVJNV0FS
RShhcGkpIFwNCiAgICAgICAgSVdMODAwMF9GV19QUkUgIi0iIF9fc3RyaW5naWZ5KGFwaSkgIi51
Y29kZSINCiANCg0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICogYWRkIG5ldyBkZXZpY2UgSURzIGZvciA4MjY1DQo+
ICogZml4IGEgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNlIHdoZW4gcGFnaW5nIGZpcm13YXJlIGFz
c2VydHMNCj4gKiByZW1vdmUgYSBXQVJOSU5HIG9uIGdzY2FuIGNhcGFiaWxpdGllcw0KPiAqIGZp
eCBNT0RVTEVfRklSTVdBUkUgZm9yIDgyNjANCj4gDQo+IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCj4gQXlhbGEgQmVrZXIg
KDEpOg0KPiAgICAgICBpd2x3aWZpOiBtdm06IGF2b2lkIHRvIFdBUk4gYWJvdXQgZ3NjYW4gY2Fw
YWJpbGl0aWVzDQo+IA0KPiBNYXR0aSBHb3R0bGllYiAoMSk6DQo+ICAgICAgIGl3bHdpZmk6IG12
bTogZml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIgZHVyaW5nIGZ3IGR1bXANCj4gY29sbGVjdGlv
bg0KPiANCj4gT3JlbiBHaXZvbiAoMSk6DQo+ICAgICAgIGl3bHdpZmk6IGFkZCBkZXZpY2UgSURz
IGZvciB0aGUgODI2NSBkZXZpY2UNCj4gDQo+IFNhcmEgU2hhcm9uICgxKToNCj4gICAgICAgaXds
d2lmaTogODAwMDogZml4IE1PRFVMRV9GSVJNV0FSRSBpbnB1dA0KPiANCj4gIGRyaXZlcnMvbmV0
L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYyAgIHwgIDIgKy0NCj4gIGRyaXZlcnMv
bmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLWRydi5jICAgIHwgMjYgKysrKysrKysrKy0t
LS0tDQo+IC0tLS0tLS0tLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp
L212bS9mdy1kYmcuYyB8ICA2ICsrKystLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwv
aXdsd2lmaS9tdm0vZncuYyAgICAgfCAgMiArKw0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50
ZWwvaXdsd2lmaS9wY2llL2Rydi5jICAgfCAxMCArKysrKysrKysrDQo+ICA1IGZpbGVzIGNoYW5n
ZWQsIDI3IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQ==
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-04-12 8:14 Grumbach, Emmanuel
2016-04-12 8:59 ` Grumbach, Emmanuel
@ 2016-04-15 14:41 ` Kalle Valo
2016-04-21 12:25 ` Valo, Kalle
1 sibling, 1 reply; 9+ messages in thread
From: Kalle Valo @ 2016-04-15 14:41 UTC (permalink / raw)
To: Grumbach, Emmanuel, David Miller; +Cc: linux-wireless@vger.kernel.org
"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?
This is the version I have in wireless-drivers-next:
https://git.kernel.org/cgit/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=a0b09f13036cedfd67c9cb4b9d05138e7022723d
And this is what Emmanuel wants to have in 4.6:
https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=cd49727e1a2bccc4ff008dde24c2f8430dd9e368
Luckily the patch is simple but still I would like hear Dave's opinion
about this. And at least the commit log in iwlwifi-fixes should mention
that it's cherry picked from iwlwifi-next.
--
Kalle Valo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-04-15 14:41 ` Kalle Valo
@ 2016-04-21 12:25 ` Valo, Kalle
0 siblings, 0 replies; 9+ messages in thread
From: Valo, Kalle @ 2016-04-21 12:25 UTC (permalink / raw)
To: Grumbach, Emmanuel; +Cc: David Miller, linux-wireless@vger.kernel.org
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-04-12 8:59 ` Grumbach, Emmanuel
@ 2016-04-21 12:41 ` Kalle Valo
0 siblings, 0 replies; 9+ messages in thread
From: Kalle Valo @ 2016-04-21 12:41 UTC (permalink / raw)
To: Grumbach, Emmanuel; +Cc: linux-wireless@vger.kernel.org
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> writes:
> 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@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.
>>
>> 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.
Pulled, thanks.
--
Kalle Valo
^ permalink raw reply [flat|nested] 9+ messages in thread
* pull request: iwlwifi 2016-04-12
@ 2016-08-07 4:35 Grumbach, Emmanuel
2016-08-07 4:38 ` Emmanuel Grumbach
0 siblings, 1 reply; 9+ messages in thread
From: Grumbach, Emmanuel @ 2016-08-07 4:35 UTC (permalink / raw)
To: kvalo@codeaurora.org; +Cc: linux-wireless@vger.kernel.org
SGkgS2FsbGUsDQoNCkhlcmUgaXMgYSBwdWxsIHJlcXVlc3QgZm9yIDQuNi4gSSBoYXZlIGhlcmUg
YSBwYXRjaCB0aGF0IHdhcyBtZXJnZWQgdG8gDQotbmV4dCBhbHJlYWR5LCBidXQgY2xlYXJseSwg
aXQgc2hvdWxkIGhhdmUgYmVlbiByb3V0ZWQgdGhyb3VnaCB0aGUNCmN1cnJlbnQgY3ljbGUncyB0
cmVlcy4gU29ycnkgYWJvdXQgdGhhdC4NClRoZSBwYXRjaCBpczoNCg0KY29tbWl0IGNkNDk3Mjdl
MWEyYmNjYzRmZjAwOGRkZTI0YzJmODQzMGRkOWUzNjgNCkF1dGhvcjogQXlhbGEgQmVrZXIgPGF5
YWxhLmJla2VyQGludGVsLmNvbT4NCkRhdGU6ICAgV2VkIEZlYiAzIDE1OjM2OjUyIDIwMTYgKzAy
MDANCg0KICAgIGl3bHdpZmk6IG12bTogYXZvaWQgdG8gV0FSTiBhYm91dCBnc2NhbiBjYXBhYmls
aXRpZXMNCiAgICANCiAgICBHc2NhbiBjYXBhYmlsaXRpZXMgd2VyZSB1cGRhdGVkIHdpdGggbmV3
IGNhcGFiaWxpdGllcyBzdXBwb3J0ZWQNCiAgICBieSB0aGUgZGV2aWNlLiBVcGRhdGUgR1NDQU4g
Y2FwYWJpbGl0aWVzIFRMViBhbmQgYXZvaWQgdG8gV0FSTg0KICAgIGlmIHRoZSBmaXJtd2FyZSBk
b2VzIG5vdCBoYXZlIHRoZSBuZXcgY2FwYWJpbGl0aWVzLg0KDQpJdCBhcHBlYXJzIGluIC1uZXh0
IGFzOg0KDQpjb21taXQgYTBiMDlmMTMwMzZjZWRmZDY3YzljYjRiOWQwNTEzOGU3MDIyNzIzZA0K
QXV0aG9yOiBBeWFsYSBCZWtlciA8YXlhbGEuYmVrZXJAaW50ZWwuY29tPg0KRGF0ZTogICBXZWQg
RmViIDMgMTU6MzY6NTIgMjAxNiArMDIwMA0KDQogICAgaXdsd2lmaTogbXZtOiB1cGRhdGUgR1ND
QU4gY2FwYWJpbGl0aWVzDQogICAgDQogICAgR3NjYW4gY2FwYWJpbGl0aWVzIHdlcmUgdXBkYXRl
ZCB3aXRoIG5ldyBjYXBhYmlsaXRpZXMgc3VwcG9ydGVkDQogICAgYnkgdGhlIGRldmljZS4gVXBk
YXRlIEdTQ0FOIGNhcGFiaWxpdGllcyBUTFYuDQoNClRoZSBjb21taXQgbWVzc2FnZSB3YXNuJ3Qg
Z29vZCBlbm91Z2ggZm9yIHRoZSBjdXJyZW50IGN5Y2xlLCBzbyBJDQpyZXdyb3RlIGl0LiBCZXNp
ZGVzIHRoYXQgb25lLCBhbGwgaXMgZmFpcmx5IG5vcm1hbC4NCkxldCBtZSBrbm93IGlmIHlvdSBo
YXZlIGlzc3VlcyENCg0KVGhhbmtzLg0KDQoNClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBj
b21taXQgN2ZkZjk2NjMyNjFjYzc3YTUxNjM5NmZlYzgyY2VlOGE4ZWEwN2U3NjoNCg0KICBpd2x3
aWZpOiBtdm06IGZpeCBtZW1vcnkgbGVhayBpbiBwYWdpbmcgKDIwMTYtMDMtMjAgMjM6MDE6NTQg
KzAyMDApDQoNCmFyZSBhdmFpbGFibGUgaW4gdGhlIGdpdCByZXBvc2l0b3J5IGF0Og0KDQogIGh0
dHBzOi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9rZXJuZWwvZ2l0L2l3bHdpZmkvaXds
d2lmaS1maXhlcy5naXQgdGFncy9pd2x3aWZpLWZvci1rYWxsZS0yMDE2LTA0LTEyDQoNCmZvciB5
b3UgdG8gZmV0Y2ggY2hhbmdlcyB1cCB0byAyZDI1ZmI4YjNhMTM4NzA2YjYzYmQyNmFkNzJhOTVj
NTgwMjk5NTRhOg0KDQogIGl3bHdpZmk6IG12bTogZml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIg
ZHVyaW5nIGZ3IGR1bXAgY29sbGVjdGlvbiAoMjAxNi0wNC0xMiAxMDowMzoxNyArMDMwMCkNCg0K
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQ0KKiBhZGQgbmV3IGRldmljZSBJRHMgZm9yIDgyNjUNCiogZml4IGEgTlVMTCBwb2lu
dGVyIGRlcmVmZXJlbmNlIHdoZW4gcGFnaW5nIGZpcm13YXJlIGFzc2VydHMNCiogcmVtb3ZlIGEg
V0FSTklORyBvbiBnc2NhbiBjYXBhYmlsaXRpZXMNCiogZml4IE1PRFVMRV9GSVJNV0FSRSBmb3Ig
ODI2MA0KDQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tDQpBeWFsYSBCZWtlciAoMSk6DQogICAgICBpd2x3aWZpOiBtdm06IGF2
b2lkIHRvIFdBUk4gYWJvdXQgZ3NjYW4gY2FwYWJpbGl0aWVzDQoNCk1hdHRpIEdvdHRsaWViICgx
KToNCiAgICAgIGl3bHdpZmk6IG12bTogZml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIgZHVyaW5n
IGZ3IGR1bXAgY29sbGVjdGlvbg0KDQpPcmVuIEdpdm9uICgxKToNCiAgICAgIGl3bHdpZmk6IGFk
ZCBkZXZpY2UgSURzIGZvciB0aGUgODI2NSBkZXZpY2UNCg0KU2FyYSBTaGFyb24gKDEpOg0KICAg
ICAgaXdsd2lmaTogODAwMDogZml4IE1PRFVMRV9GSVJNV0FSRSBpbnB1dA0KDQogZHJpdmVycy9u
ZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9pd2wtODAwMC5jICAgfCAgMiArLQ0KIGRyaXZlcnMv
bmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLWRydi5jICAgIHwgMjYgKysrKysrKysrKy0t
LS0tLS0tLS0tLS0tLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZpL212bS9m
dy1kYmcuYyB8ICA2ICsrKystLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkv
bXZtL2Z3LmMgICAgIHwgIDIgKysNCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp
L3BjaWUvZHJ2LmMgICB8IDEwICsrKysrKysrKysNCiA1IGZpbGVzIGNoYW5nZWQsIDI3IGluc2Vy
dGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQ==
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-08-07 4:35 pull request: iwlwifi 2016-04-12 Grumbach, Emmanuel
@ 2016-08-07 4:38 ` Emmanuel Grumbach
2016-08-15 8:14 ` Kalle Valo
2016-08-25 9:54 ` Luca Coelho
0 siblings, 2 replies; 9+ messages in thread
From: Emmanuel Grumbach @ 2016-08-07 4:38 UTC (permalink / raw)
To: Grumbach, Emmanuel; +Cc: kvalo@codeaurora.org, linux-wireless@vger.kernel.org
On Sun, Aug 7, 2016 at 7:35 AM, Grumbach, Emmanuel
<emmanuel.grumbach@intel.com> wrote:
>
> Hi Kalle,
>
> Here is a pull request for 4.6. I have here a patch that was merged to
> -next already, but clearly, it should have been routed through the
> current cycle's trees. Sorry about that.
> The patch is:
Wow.. I knew evolution was sometimes stupid, but this is new to me..
Obviously you should ignore that.
Sorry...
>
> 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.
>
> It 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.
>
> The commit message wasn't good enough for the current cycle, so I
> rewrote it. Besides that one, all is fairly normal.
> Let me know if you have issues!
>
> 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-fixes.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)
>
> ----------------------------------------------------------------
> * 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(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-08-07 4:38 ` Emmanuel Grumbach
@ 2016-08-15 8:14 ` Kalle Valo
2016-08-25 9:54 ` Luca Coelho
1 sibling, 0 replies; 9+ messages in thread
From: Kalle Valo @ 2016-08-15 8:14 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: Grumbach, Emmanuel, linux-wireless@vger.kernel.org
Emmanuel Grumbach <egrumbach@gmail.com> writes:
> On Sun, Aug 7, 2016 at 7:35 AM, Grumbach, Emmanuel
> <emmanuel.grumbach@intel.com> wrote:
>>
>> Hi Kalle,
>>
>> Here is a pull request for 4.6. I have here a patch that was merged to
>> -next already, but clearly, it should have been routed through the
>> current cycle's trees. Sorry about that.
>> The patch is:
>
>
> Wow.. I knew evolution was sometimes stupid, but this is new to me..
> Obviously you should ignore that.
> Sorry...
Ok, I dropped this :)
--
Kalle Valo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: pull request: iwlwifi 2016-04-12
2016-08-07 4:38 ` Emmanuel Grumbach
2016-08-15 8:14 ` Kalle Valo
@ 2016-08-25 9:54 ` Luca Coelho
1 sibling, 0 replies; 9+ messages in thread
From: Luca Coelho @ 2016-08-25 9:54 UTC (permalink / raw)
To: Emmanuel Grumbach, Grumbach, Emmanuel
Cc: kvalo@codeaurora.org, linux-wireless@vger.kernel.org
On Sun, 2016-08-07 at 07:38 +0300, Emmanuel Grumbach wrote:
> On Sun, Aug 7, 2016 at 7:35 AM, Grumbach, Emmanuel
> <emmanuel.grumbach@intel.com> wrote:
> >
> >
> > Hi Kalle,
> >
> > Here is a pull request for 4.6. I have here a patch that was merged
> > to
> > -next already, but clearly, it should have been routed through the
> > current cycle's trees. Sorry about that.
> > The patch is:
>
>
> Wow.. I knew evolution was sometimes stupid, but this is new to me..
Which evolution are you blaming here? The email client or the evolution
of species? :D
--
Luca.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-08-25 9:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-07 4:35 pull request: iwlwifi 2016-04-12 Grumbach, Emmanuel
2016-08-07 4:38 ` Emmanuel Grumbach
2016-08-15 8:14 ` Kalle Valo
2016-08-25 9:54 ` Luca Coelho
-- strict thread matches above, loose matches on Subject: below --
2016-04-12 8:14 Grumbach, Emmanuel
2016-04-12 8:59 ` Grumbach, Emmanuel
2016-04-21 12:41 ` Kalle Valo
2016-04-15 14:41 ` Kalle Valo
2016-04-21 12:25 ` Valo, Kalle
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).