2015-03-07 17:47:59

by Grumbach, Emmanuel

[permalink] [raw]
Subject: pull request: iwlwifi-next 2015-03-07

SGkgS2FsbGUsDQoNClRoaXMgaXMgdGhlIGZpeCBmb3IgdGhlIHVuZm9ydHVuYXRlIGNvbXBpbGF0
aW9uIHByb2JsZW0gSSBjYXVzZWQgaW4NCml3bHdpZmktbmV4dC4NCg0KUGxlYXNlIHB1bGwuDQoN
ClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21taXQNCjE5MGYxMDI5NzU3MzQ2YjcyZjI5
NzcyOWNmOGU1YzU2MmYyZTlkOGM6DQoNCiAgaXdsd2lmaTogbXZtOiBkb24ndCBvdmVycmlkZSBw
YXNzaXZlIGR3ZWxsIGluIGNhc2Ugb2YgZnJhZ21lbnRlZCBzY2FuDQooMjAxNS0wMy0wMiAwODoy
MDozMiArMDIwMCkNCg0KYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6DQoN
Cg0KaHR0cHM6Ly9naXQua2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvaXdsd2lm
aS9pd2x3aWZpLW5leHQuZ2l0DQp0YWdzL2l3bHdpZmktbmV4dC1mb3Ita2FsbGUtMjAxNS0wMy0w
Nw0KDQpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMgdXAgdG8gYWE1ZTE4MzIwNzg4NzI4NDc2ZTg0
ZTIxNDBhYTczNmJjNTUyNWM4NzoNCg0KICBpd2x3aWZpOiBtdm06IGZpeCBjb21waWxhdGlvbiB3
aXRoIElXTFdJRklfREVCVUdGUyBub3Qgc2V0ICgyMDE1LTAzLTA3DQoxOTo0MDowMiArMDIwMCkN
Cg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLQ0KZml4IGNvbXBpbGF0aW9uIHdoZW4gREVCVUdGUyBpc24ndCBzZXQNCg0KLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLQ0KRW1tYW51ZWwgR3J1bWJhY2ggKDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBmaXggY29t
cGlsYXRpb24gd2l0aCBJV0xXSUZJX0RFQlVHRlMgbm90IHNldA0KDQogZHJpdmVycy9uZXQvd2ly
ZWxlc3MvaXdsd2lmaS9tdm0vZGVidWdmcy12aWYuYyB8IDEgLQ0KIGRyaXZlcnMvbmV0L3dpcmVs
ZXNzL2l3bHdpZmkvbXZtL21hYzgwMjExLmMgICAgfCAyICsrDQogZHJpdmVycy9uZXQvd2lyZWxl
c3MvaXdsd2lmaS9tdm0vbXZtLmggICAgICAgICB8IDIgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVz
cy9pd2x3aWZpL212bS9waHktY3R4dC5jICAgIHwgMiArKw0KIDQgZmlsZXMgY2hhbmdlZCwgNSBp
bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQ0KDQo=


2015-03-09 19:39:05

by David Miller

[permalink] [raw]
Subject: Re: pull request: iwlwifi-next 2015-03-07

From: Kalle Valo <[email protected]>
Date: Sun, 08 Mar 2015 09:42:40 +0200

> can you pull this directly? I don't think there's any point for me to
> pull this to my tree as I don't have anything else queued up for -next
> at the moment. I can fast forward my tree once you have pulled this.

Done.

2015-03-08 07:42:46

by Kalle Valo

[permalink] [raw]
Subject: Re: pull request: iwlwifi-next 2015-03-07

Hi Dave,

can you pull this directly? I don't think there's any point for me to
pull this to my tree as I don't have anything else queued up for -next
at the moment. I can fast forward my tree once you have pulled this.

The tag is:

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git
tags/iwlwifi-next-for-kalle-2015-03-07

Emmanuel, thanks for the quick fix.

Kalle

"Grumbach, Emmanuel" <[email protected]> writes:

> This is the fix for the unfortunate compilation problem I caused in
> iwlwifi-next.
>
> Please pull.
>
> The following changes since commit
> 190f1029757346b72f297729cf8e5c562f2e9d8c:
>
> iwlwifi: mvm: don't override passive dwell in case of fragmented scan
> (2015-03-02 08:20:32 +0200)
>
> are available in the git repository at:
>
>
> https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git
> tags/iwlwifi-next-for-kalle-2015-03-07
>
> for you to fetch changes up to aa5e18320788728476e84e2140aa736bc5525c87:
>
> iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set (2015-03-07
> 19:40:02 +0200)
>
> ----------------------------------------------------------------
> fix compilation when DEBUGFS isn't set
>
> ----------------------------------------------------------------
> Emmanuel Grumbach (1):
> iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set
>
> drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 1 -
> drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 ++
> drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 +-
> drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 ++
> 4 files changed, 5 insertions(+), 2 deletions(-)
>

--
Kalle Valo