netdev - Re: pull-request: wireless-drivers-next 2015-01-22

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <8761bznghy.fsf@kamboji.qca.qualcomm.com>
Date:	Thu, 22 Jan 2015 14:31:53 +0200
From:	Kalle Valo <kvalo@....qualcomm.com>
To:	David Miller <davem@...emloft.net>
CC:	<linux-wireless@...r.kernel.org>, <netdev@...r.kernel.org>
Subject: Re: pull-request: wireless-drivers-next 2015-01-22

Kalle Valo <kvalo@...eaurora.org> writes:

> Hi Dave,
>
> now a bigger pull request for net-next. Rafal found a UTF-8 bug in
> patchwork[1] and because of that two commits (d0c102f70aec and
> d0f66df5392a) have his name corrupted:
>
>     Acked-by: Rafa? Mi?ecki <zajec5@...il.com>
>
> Somehow I failed to spot that when I commited the patches. As rebasing
> public git trees is bad, I thought we can live with these and decided
> not to rebase. But I'll pay close attention to this in the future to
> make sure that it won't happen again. Also we requested an update to
> patchwork.kernel.org, the latest patchwork doesn't seem to have this
> bug.
>
> Also please note this pull request also adds one DT binding doc, but
> this was reviewed in the device tree list:
>
>  .../bindings/net/wireless/qcom,ath10k.txt          |   30 +
>
> Please let me know if you have any issues.

I almost missed that there's actually a small conflict with net-next:

CONFLICT (content): Merge conflict in drivers/net/wireless/ath/wil6210/cfg80211.c

Please fix it like this in wil_cid_fill_sinfo():

	if (test_bit(wil_status_fwconnected, wil->status)) {
		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
		sinfo->signal = reply.evt.sqi;
	}

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html