From: Emmanuel Grumbach <egrumbach@gmail.com>
To: John Linville <linville@tuxdriver.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: Re: pull request: iwlwifi-next 2013-12-2
Date: Mon, 09 Dec 2013 22:32:55 +0200 [thread overview]
Message-ID: <52A628F7.7050408@gmail.com> (raw)
In-Reply-To: <529E129B.6080807@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]
Hi John,
On 12/03/2013 07:19 PM, Emmanuel Grumbach wrote:
>
>
> On 12/02/2013 10:51 PM, Emmanuel Grumbach wrote:
>> Hi John,
>>
>> This is the fixed and enlarged pull request for 3.14. It includes the
>> patches in my previous pull request that was based on a bad patch.
>>
>> I have here a big rework of the rate control by Eyal. This is obviously
>> the biggest part of this batch.
>> I also have enhancement of protection flags by Avri and a few bits for
>> WoWLAN by Eliad and Luca. Johannes cleans up the debugfs plus a few
>> fixes. I provided a few things for Bluetooth coexistence.
>> Besides this we have an implementation for low priority scan.
>>
>> Note that I had to merge iwlwifi-fixes into -next to solve conflicts
>> before they hit linux-next.
>> Please let me know about issues you may face - Thanks!
>>
>
> So - I found out that merging iwlwifi-fixes wasn't a good idea... So I
> updated my tree and added a trivial compilation fix.
>
> New head: 2f579448f3a60c8ede544dd0951b8d2a2e282ba2.
>
> I hope that I have done all the possible mistakes now and that next time
> I will get it right the first time... Sorry for all the mess...
>
Since you merged wireless into wireless-next, I decided to rebase my
tree on top of wireless-next to make your life easier. I solved the
conflicts you would have faced.
New head: 9d10849e4ea8bf9d8da80afa73918a9fe45c09ef.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-12-09 20:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-02 20:51 pull request: iwlwifi-next 2013-12-2 Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 01/13] iwlwifi: mvm: rs: improve debug prints Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 02/13] iwlwifi: mvm: rs: reduce min failures to end test window Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 03/13] iwlwifi: mvm: rs: update expected TPT tables if aggregation changed Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 04/13] iwlwifi: mvm: rs: rename thresholds defines Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 05/13] iwlwifi: mvm: rs: increase stay in column timeout Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 06/13] iwlwifi: mvm: rs: remove unused timestamp field Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 07/13] iwlwifi: mvm: rs: refactor to use rs_rate Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 08/13] iwlwifi: mvm: rs: remove unused parameter to rs_get_supported_rates Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 09/13] iwlwifi: mvm: rs: set dual_stream_ant_msk to ANT_AB always Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 10/13] iwlwifi: mvm: rs: fix mapping from HT/VHT rates to legacy Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 11/13] iwlwifi: mvm: rs: use the proper channel width define for legacy rate Emmanuel Grumbach
2013-12-02 20:59 ` [PATCH 12/13] iwlwifi: mvm: rs: overhaul search cycle state machine Emmanuel Grumbach
2014-01-06 15:07 ` Karl Beldan
2014-01-06 18:04 ` Eyal Shapira
2014-01-07 10:27 ` Karl Beldan
2014-01-07 16:30 ` Eyal Shapira
2014-01-07 18:13 ` Karl Beldan
2014-01-07 18:34 ` Eyal Shapira
2013-12-02 20:59 ` [PATCH 13/13] iwlwifi: mvm: BT Coex - enable Sync to SCO Emmanuel Grumbach
2013-12-03 17:19 ` pull request: iwlwifi-next 2013-12-2 Emmanuel Grumbach
2013-12-09 20:27 ` John W. Linville
2013-12-09 20:38 ` Emmanuel Grumbach
2013-12-11 15:50 ` John W. Linville
2013-12-09 20:32 ` Emmanuel Grumbach [this message]
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=52A628F7.7050408@gmail.com \
--to=egrumbach@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).