* pull-request: iwlwifi-next 2017-11-29
@ 2017-11-29 8:15 Luca Coelho
2017-12-02 13:27 ` Kalle Valo
0 siblings, 1 reply; 3+ messages in thread
From: Luca Coelho @ 2017-11-29 8:15 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, linuxwifi, david.e.box, janet.morgan, joe.konno
[-- Attachment #1: Type: text/plain, Size: 4184 bytes --]
Hi Kalle,
This is my first batch of patches intended for v4.16. As I mentioned
in the patchset thread, I removed patch 08/11 because it was broken.
More details about the contents in the tag description.
I have sent this out before and kbuildbot reported success.
Please let me know if there are any issues.
Cheers,
Luca.
The following changes since commit fdd0bd88ceaecf729db103ac8836af5805dd2dc1:
brcmfmac: add CLM download support (2017-11-11 03:04:09 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-11-29
for you to fetch changes up to 2f7a3863191afc2c132854b7ffb1b867b4b9e8be:
iwlwifi: rename the temporary name of A000 to the official 22000 (2017-11-28 16:39:57 +0200)
----------------------------------------------------------------
First batch of iwlwifi updates for v4.16
* Rename the temporary name A000 to 22000;
* Change in the way we print the firmware version;
* Remove some unused code;
* Other small improvements;
----------------------------------------------------------------
Emmanuel Grumbach (4):
iwlwifi: mvm: rs: don't override the rate history in the search cycle
iwlwifi: mvm: revert support new Coex firmware API
iwlwifi: print the version number of the firmware in hex
iwlwifi: fix the ALIVE notification layout
Johannes Berg (2):
iwlwifi: mvm: remove TCP wakeup support
iwlwifi: mvm: remove superfluous flush_work()
Liad Kaufman (2):
iwlwifi: mvm: support MGMT frames in compressed BA
iwlwifi: dbg: allow wrt collection before ALIVE
Luca Coelho (1):
iwlwifi: rename the temporary name of A000 to the official 22000
Sara Sharon (1):
iwlwifi: mvm: check for short GI only for OFDM
drivers/net/wireless/intel/iwlwifi/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 216 ------------------------------------------------------------------------------------------
drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 4 +-
drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 30 -------------
drivers/net/wireless/intel/iwlwifi/fw/api/commands.h | 2 +-
drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 4 +-
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 ++++++-
drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 --
drivers/net/wireless/intel/iwlwifi/fw/smem.c | 8 ++--
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 20 ++++-----
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 11 +++--
drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 12 ++---
drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 33 +++-----------
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 232 +------------------------------------------------------------------------------------------------
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 12 ++---
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 6 +--
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 30 +++----------
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 8 +---
drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 +-
drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 +-
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +-
drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 ++---
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 6 ---
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 +++--
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 36 +++++++--------
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +-
28 files changed, 323 insertions(+), 622 deletions(-)
create mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/22000.c
delete mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/a000.c
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: pull-request: iwlwifi-next 2017-11-29
2017-11-29 8:15 pull-request: iwlwifi-next 2017-11-29 Luca Coelho
@ 2017-12-02 13:27 ` Kalle Valo
2017-12-02 16:08 ` Luca Coelho
0 siblings, 1 reply; 3+ messages in thread
From: Kalle Valo @ 2017-12-02 13:27 UTC (permalink / raw)
To: Luca Coelho
Cc: linux-wireless, linuxwifi, david.e.box, janet.morgan, joe.konno
Luca Coelho <luca@coelho.fi> writes:
> This is my first batch of patches intended for v4.16. As I mentioned
> in the patchset thread, I removed patch 08/11 because it was broken.
> More details about the contents in the tag description.
>
> I have sent this out before and kbuildbot reported success.
>
> Please let me know if there are any issues.
>
> Cheers,
> Luca.
>
>
> The following changes since commit fdd0bd88ceaecf729db103ac8836af5805dd2dc1:
>
> brcmfmac: add CLM download support (2017-11-11 03:04:09 +0200)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-11-29
>
> for you to fetch changes up to 2f7a3863191afc2c132854b7ffb1b867b4b9e8be:
>
> iwlwifi: rename the temporary name of A000 to the official 22000 (2017-11-28 16:39:57 +0200)
>
> ----------------------------------------------------------------
> First batch of iwlwifi updates for v4.16
>
> * Rename the temporary name A000 to 22000;
> * Change in the way we print the firmware version;
> * Remove some unused code;
> * Other small improvements;
>
> ----------------------------------------------------------------
Pulled, thanks.
But there were few conflicts due to my fast forward from yesterday,
please check my resolution. I tried to be careful that fixes in
c2c48ddfc8b0 ("iwlwifi: fix firmware names for 9000 and A000 series hw")
won't get lost.
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-11-29
>From git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* tag iwlwifi-next-for-kalle-2017-11-29 -> FETCH_HEAD
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-config.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h
CONFLICT (modify/delete): drivers/net/wireless/intel/iwlwifi/cfg/a000.c deleted in ca495785063c428641cc6df8888afd2587ca6677 and modified in HEAD. Version HEAD of drivers/net/wireless/intel/iwlwifi/cfg/a000.c left in tree.
Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/iwl-config.h'
Automatic merge failed; fix conflicts and then commit the result.
--
Kalle Valo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: pull-request: iwlwifi-next 2017-11-29
2017-12-02 13:27 ` Kalle Valo
@ 2017-12-02 16:08 ` Luca Coelho
0 siblings, 0 replies; 3+ messages in thread
From: Luca Coelho @ 2017-12-02 16:08 UTC (permalink / raw)
To: Kalle Valo
Cc: linux-wireless, linuxwifi, david.e.box, janet.morgan, joe.konno
On Sat, 2017-12-02 at 15:27 +0200, Kalle Valo wrote:
> Luca Coelho <luca@coelho.fi> writes:
>
> > This is my first batch of patches intended for v4.16. As I
> > mentioned
> > in the patchset thread, I removed patch 08/11 because it was
> > broken.
> > More details about the contents in the tag description.
> >
> > I have sent this out before and kbuildbot reported success.
> >
> > Please let me know if there are any issues.
> >
> > Cheers,
> > Luca.
> >
> >
> > The following changes since commit
> > fdd0bd88ceaecf729db103ac8836af5805dd2dc1:
> >
> > brcmfmac: add CLM download support (2017-11-11 03:04:09 +0200)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-
> > next.git tags/iwlwifi-next-for-kalle-2017-11-29
> >
> > for you to fetch changes up to
> > 2f7a3863191afc2c132854b7ffb1b867b4b9e8be:
> >
> > iwlwifi: rename the temporary name of A000 to the official 22000
> > (2017-11-28 16:39:57 +0200)
> >
> > ----------------------------------------------------------------
> > First batch of iwlwifi updates for v4.16
> >
> > * Rename the temporary name A000 to 22000;
> > * Change in the way we print the firmware version;
> > * Remove some unused code;
> > * Other small improvements;
> >
> > ----------------------------------------------------------------
>
> Pulled, thanks.
>
> But there were few conflicts due to my fast forward from yesterday,
> please check my resolution. I tried to be careful that fixes in
> c2c48ddfc8b0 ("iwlwifi: fix firmware names for 9000 and A000 series
> hw")
> won't get lost.
Looks good, Kalle! Thanks!
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-02 16:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29 8:15 pull-request: iwlwifi-next 2017-11-29 Luca Coelho
2017-12-02 13:27 ` Kalle Valo
2017-12-02 16:08 ` Luca Coelho
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox