* pull-request: iwlwifi-next 2017-04-13
@ 2017-04-13 12:34 Luca Coelho
2017-04-18 6:34 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Luca Coelho @ 2017-04-13 12:34 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, linuxwifi
[-- Attachment #1: Type: text/plain, Size: 5864 bytes --]
Hi Kalle,
Here's my first pull-request intended for v4.12. This is generic
development work, nothing really stands out. More
details 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 1aed89640a899cd695bbfc976a4356affa474646:
mwifiex: apply radar flag (2017-04-05 15:54:52 +0300)
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-04-13
for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4:
iwlwifi: mvm: separate queue mapping from queue enablement (2017-04-11 15:25:00 +0300)
----------------------------------------------------------------
Patches intended for v4.12:
* Some small fixes here and there;
* The usual cleanups and small improvements;
* Work to support A000 devices continues;
* New FW API version;
* Some debugging improvements;
----------------------------------------------------------------
Emmanuel Grumbach (2):
iwlwifi: mvm: add DQA_ENABLE_CMD to the command list
iwlwifi: pcie: print less data upon firmware crash
Golan Ben-Ami (1):
iwlwifi: mvm: support MFUART dump in case of MFUART assert
Johannes Berg (3):
iwlwifi: mvm: fix RX SKB header size and align it properly
iwlwifi: use upper_32_bits/lower_32_bits where appropriate
iwlwifi: pcie: use iwl_get_dma_hi_addr()
Liad Kaufman (1):
iwlwifi: add support for 9000 HW B-step NICs
Luca Coelho (4):
iwlwifi: be more verbose about needed firmware
iwlwifi: remove support for deprecated RF
iwlwifi: mvm: bump max API to 30
iwlwifi: remove unnecessary dev_cmd_headroom parameter
Sara Sharon (14):
iwlwifi: mvm: support new binding API
iwlwifi: mvm: adjust new API of compressed BA
iwlwifi: mvm: cleanup pending frames in DQA mode
iwlwifi: mvm: add multicast station
iwlwifi: mvm: support new ADD_MODIFY_STA_KEY command
iwlwifi: mvm: optimize reorder timeout frame releasing
iwlwifi: mvm: don't assume static queue numbers
Revert "iwlwifi: introduce trans API to get byte count table"
iwlwifi: pcie: remove the active field in struct iwl_txq
iwlwifi: pcie: use WFPM_GP for debugging D3 flows
iwlwifi: pcie: introduce split point to a000 devices
iwlwifi: pcie: add context information support
iwlwifi: mvm: remove call for paging in new init flow
iwlwifi: mvm: separate queue mapping from queue enablement
drivers/net/wireless/intel/iwlwifi/Makefile | 1 +
drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 +-
drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 +-
drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 46 +++++--------
drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 5 +-
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 12 ++--
drivers/net/wireless/intel/iwlwifi/iwl-context-info.h | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 -
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 34 +++++++--
drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 6 +-
drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 5 ++
drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 +-
drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 +
drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 7 +-
drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 28 ++------
drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 17 ++++-
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 20 +++++-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 34 +++++++--
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 5 ++
drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 40 +++++++++--
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 32 ++++++---
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 1 +
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 34 +++++++--
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 25 ++++---
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 12 ++++
drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 18 ++++-
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 20 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 241 ++++++++++++++++++++++++++++++++++++++++++----------------------
drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +-
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 49 ++++++-------
drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 34 +++++----
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 17 ++---
drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 53 ++++++++++++--
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 48 ++++++++++---
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 218 +++++++++++++++++++++++++++++-----------------------------
drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 99 ++++++++++++++++-----------
38 files changed, 1462 insertions(+), 422 deletions(-)
create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-context-info.h
create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: pull-request: iwlwifi-next 2017-04-13 2017-04-13 12:34 pull-request: iwlwifi-next 2017-04-13 Luca Coelho @ 2017-04-18 6:34 ` Kalle Valo 2017-04-18 6:56 ` Kalle Valo 0 siblings, 1 reply; 5+ messages in thread From: Kalle Valo @ 2017-04-18 6:34 UTC (permalink / raw) To: Luca Coelho; +Cc: linux-wireless, linuxwifi Luca Coelho <luca@coelho.fi> writes: > Here's my first pull-request intended for v4.12. This is generic > development work, nothing really stands out. More > details 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 1aed89640a899cd695bbfc976a4356affa474646: > > mwifiex: apply radar flag (2017-04-05 15:54:52 +0300) > > 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-04-13 > > for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4: > > iwlwifi: mvm: separate queue mapping from queue enablement (2017-04-11 15:25:00 +0300) > > ---------------------------------------------------------------- > Patches intended for v4.12: > > * Some small fixes here and there; > * The usual cleanups and small improvements; > * Work to support A000 devices continues; > * New FW API version; > * Some debugging improvements; > > ---------------------------------------------------------------- This one has few conflicts. I can fix those manually, but can you give some guidance how? diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c index 9d28db7f56aa,2d68cee41306..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@@ -1806,11 -1805,10 +1805,16 @@@ int iwl_mvm_send_add_bcast_sta(struct i iwl_mvm_get_wd_timeout(mvm, vif, false, false); int queue; ++<<<<<<< HEAD + if (vif->type == NL80211_IFTYPE_AP || + vif->type == NL80211_IFTYPE_ADHOC) + queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; ++======= + if (vif->type == NL80211_IFTYPE_AP) + queue = mvm->probe_queue; ++>>>>>>> 17f9a54c7f7636fb67540a122d2dcf9ce47db9db else if (vif->type == NL80211_IFTYPE_P2P_DEVICE) - queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE; + queue = mvm->p2p_dev_queue; else if (WARN(1, "Missing required TXQ for adding bcast STA\n")) return -EINVAL; @@@ -1827,34 -1825,8 +1831,36 @@@ ret = iwl_mvm_add_int_sta_common(mvm, bsta, baddr, mvmvif->id, mvmvif->color); - if (ret) - return ret; ++<<<<<<< HEAD + /* + * In AP vif type, we also need to enable the cab_queue. However, we + * have to enable it after the ADD_STA command is sent, otherwise the + * FW will throw an assert once we send the ADD_STA command (it'll + * detect a mismatch in the tfd_queue_msk, as we can't add the + * enabled-cab_queue to the mask) + */ + if (iwl_mvm_is_dqa_supported(mvm) && + (vif->type == NL80211_IFTYPE_AP || + vif->type == NL80211_IFTYPE_ADHOC)) { + struct iwl_trans_txq_scd_cfg cfg = { + .fifo = IWL_MVM_TX_FIFO_MCAST, + .sta_id = mvmvif->bcast_sta.sta_id, + .tid = IWL_MAX_TID_COUNT, + .aggregate = false, + .frame_limit = IWL_FRAME_LIMIT, + }; + unsigned int wdg_timeout = + iwl_mvm_get_wd_timeout(mvm, vif, false, false); + + iwl_mvm_enable_txq(mvm, vif->cab_queue, vif->cab_queue, + 0, &cfg, wdg_timeout); + } + + return 0; ++======= + return ret; ++>>>>>>> 17f9a54c7f7636fb67540a122d2dcf9ce47db9db } static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm, @@@ -1864,29 -1836,18 +1870,30 @@@ lockdep_assert_held(&mvm->mutex); ++<<<<<<< HEAD + if (vif->type == NL80211_IFTYPE_AP || + vif->type == NL80211_IFTYPE_ADHOC) + iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue, + IWL_MAX_TID_COUNT, 0); + + if (mvmvif->bcast_sta.tfd_queue_msk & + BIT(IWL_MVM_DQA_AP_PROBE_RESP_QUEUE)) { + iwl_mvm_disable_txq(mvm, + IWL_MVM_DQA_AP_PROBE_RESP_QUEUE, ++======= + if (mvmvif->bcast_sta.tfd_queue_msk & BIT(mvm->probe_queue)) { + iwl_mvm_disable_txq(mvm, mvm->probe_queue, ++>>>>>>> 17f9a54c7f7636fb67540a122d2dcf9ce47db9db vif->hw_queue[0], IWL_MAX_TID_COUNT, 0); - mvmvif->bcast_sta.tfd_queue_msk &= - ~BIT(IWL_MVM_DQA_AP_PROBE_RESP_QUEUE); + mvmvif->bcast_sta.tfd_queue_msk &= ~BIT(mvm->probe_queue); } - if (mvmvif->bcast_sta.tfd_queue_msk & - BIT(IWL_MVM_DQA_P2P_DEVICE_QUEUE)) { - iwl_mvm_disable_txq(mvm, - IWL_MVM_DQA_P2P_DEVICE_QUEUE, + if (mvmvif->bcast_sta.tfd_queue_msk & BIT(mvm->p2p_dev_queue)) { + iwl_mvm_disable_txq(mvm, mvm->p2p_dev_queue, vif->hw_queue[0], IWL_MAX_TID_COUNT, 0); - mvmvif->bcast_sta.tfd_queue_msk &= - ~BIT(IWL_MVM_DQA_P2P_DEVICE_QUEUE); + mvmvif->bcast_sta.tfd_queue_msk &= ~BIT(mvm->p2p_dev_queue); } } diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 1ba0a6f55503,568b0793e84e..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@@ -518,12 -517,11 +518,17 @@@ static int iwl_mvm_get_ctrl_vif_queue(s if (info->hw_queue == info->control.vif->cab_queue) return info->hw_queue; ++<<<<<<< HEAD + WARN_ONCE(info->control.vif->type != NL80211_IFTYPE_ADHOC, + "fc=0x%02x", le16_to_cpu(fc)); + return IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; ++======= + WARN_ONCE(1, "fc=0x%02x", le16_to_cpu(fc)); + return mvm->probe_queue; ++>>>>>>> 17f9a54c7f7636fb67540a122d2dcf9ce47db9db case NL80211_IFTYPE_P2P_DEVICE: if (ieee80211_is_mgmt(fc)) - return IWL_MVM_DQA_P2P_DEVICE_QUEUE; + return mvm->p2p_dev_queue; if (info->hw_queue == info->control.vif->cab_queue) return info->hw_queue; ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-13 2017-04-18 6:34 ` Kalle Valo @ 2017-04-18 6:56 ` Kalle Valo 2017-04-18 8:22 ` Luca Coelho 0 siblings, 1 reply; 5+ messages in thread From: Kalle Valo @ 2017-04-18 6:56 UTC (permalink / raw) To: Luca Coelho; +Cc: linux-wireless@vger.kernel.org, linuxwifi Kalle Valo <kvalo@codeaurora.org> writes: > Luca Coelho <luca@coelho.fi> writes: > >> Here's my first pull-request intended for v4.12. This is generic >> development work, nothing really stands out. More >> details 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 1aed89640a899cd695bbfc976a4356affa474= 646: >> >> mwifiex: apply radar flag (2017-04-05 15:54:52 +0300) >> >> 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-04-13 >> >> for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4: >> >> iwlwifi: mvm: separate queue mapping from queue enablement (2017-04-11= 15:25:00 +0300) >> >> ---------------------------------------------------------------- >> Patches intended for v4.12: >> >> * Some small fixes here and there; >> * The usual cleanups and small improvements; >> * Work to support A000 devices continues; >> * New FW API version; >> * Some debugging improvements; >> >> ---------------------------------------------------------------- > > This one has few conflicts. I can fix those manually, but can you give > some guidance how? I think I got it now, see below for the diff I did. Can you please check that? The resolution is also in the pending branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next= .git/log/?h=3Dpending diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c index 9d28db7f56aa,2d68cee41306..a552955f72f7 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@@ -1806,11 -1805,10 +1805,11 @@@ int iwl_mvm_send_add_bcast_sta(struct i iwl_mvm_get_wd_timeout(mvm, vif, false, false); int queue; =20 - if (vif->type =3D=3D NL80211_IFTYPE_AP) + if (vif->type =3D=3D NL80211_IFTYPE_AP || + vif->type =3D=3D NL80211_IFTYPE_ADHOC) - queue =3D IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; + queue =3D mvm->probe_queue; else if (vif->type =3D=3D NL80211_IFTYPE_P2P_DEVICE) - queue =3D IWL_MVM_DQA_P2P_DEVICE_QUEUE; + queue =3D mvm->p2p_dev_queue; else if (WARN(1, "Missing required TXQ for adding bcast STA\n")) return -EINVAL; =20 @@@ -1864,29 -1836,18 +1863,23 @@@ static void iwl_mvm_free_bcast_sta_queu =20 lockdep_assert_held(&mvm->mutex); =20 + if (vif->type =3D=3D NL80211_IFTYPE_AP || + vif->type =3D=3D NL80211_IFTYPE_ADHOC) + iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue, + IWL_MAX_TID_COUNT, 0); + - if (mvmvif->bcast_sta.tfd_queue_msk & - BIT(IWL_MVM_DQA_AP_PROBE_RESP_QUEUE)) { - iwl_mvm_disable_txq(mvm, - IWL_MVM_DQA_AP_PROBE_RESP_QUEUE, + if (mvmvif->bcast_sta.tfd_queue_msk & BIT(mvm->probe_queue)) { + iwl_mvm_disable_txq(mvm, mvm->probe_queue, vif->hw_queue[0], IWL_MAX_TID_COUNT, 0); - mvmvif->bcast_sta.tfd_queue_msk &=3D - ~BIT(IWL_MVM_DQA_AP_PROBE_RESP_QUEUE); + mvmvif->bcast_sta.tfd_queue_msk &=3D ~BIT(mvm->probe_queue); } =20 - if (mvmvif->bcast_sta.tfd_queue_msk & - BIT(IWL_MVM_DQA_P2P_DEVICE_QUEUE)) { - iwl_mvm_disable_txq(mvm, - IWL_MVM_DQA_P2P_DEVICE_QUEUE, + if (mvmvif->bcast_sta.tfd_queue_msk & BIT(mvm->p2p_dev_queue)) { + iwl_mvm_disable_txq(mvm, mvm->p2p_dev_queue, vif->hw_queue[0], IWL_MAX_TID_COUNT, 0); - mvmvif->bcast_sta.tfd_queue_msk &=3D - ~BIT(IWL_MVM_DQA_P2P_DEVICE_QUEUE); + mvmvif->bcast_sta.tfd_queue_msk &=3D ~BIT(mvm->p2p_dev_queue); } } =20 diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 1ba0a6f55503,568b0793e84e..ffbbe7228f5d --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@@ -518,12 -517,11 +518,12 @@@ static int iwl_mvm_get_ctrl_vif_queue(s if (info->hw_queue =3D=3D info->control.vif->cab_queue) return info->hw_queue; =20 - WARN_ONCE(1, "fc=3D0x%02x", le16_to_cpu(fc)); + WARN_ONCE(info->control.vif->type !=3D NL80211_IFTYPE_ADHOC, + "fc=3D0x%02x", le16_to_cpu(fc)); - return IWL_MVM_DQA_AP_PROBE_RESP_QUEUE; + return mvm->probe_queue; case NL80211_IFTYPE_P2P_DEVICE: if (ieee80211_is_mgmt(fc)) - return IWL_MVM_DQA_P2P_DEVICE_QUEUE; + return mvm->p2p_dev_queue; if (info->hw_queue =3D=3D info->control.vif->cab_queue) return info->hw_queue; = ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-13 2017-04-18 6:56 ` Kalle Valo @ 2017-04-18 8:22 ` Luca Coelho 2017-04-18 12:30 ` Kalle Valo 0 siblings, 1 reply; 5+ messages in thread From: Luca Coelho @ 2017-04-18 8:22 UTC (permalink / raw) To: Kalle Valo; +Cc: linux-wireless@vger.kernel.org, linuxwifi On Tue, 2017-04-18 at 06:56 +0000, Kalle Valo wrote: > Kalle Valo <kvalo@codeaurora.org> writes: > > > Luca Coelho <luca@coelho.fi> writes: > > > > > Here's my first pull-request intended for v4.12. This is generic > > > development work, nothing really stands out. More > > > details 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 1aed89640a899cd695bbfc976a4356affa474646: > > > > > > mwifiex: apply radar flag (2017-04-05 15:54:52 +0300) > > > > > > 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-04-13 > > > > > > for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4: > > > > > > iwlwifi: mvm: separate queue mapping from queue enablement (2017-04-11 15:25:00 +0300) > > > > > > ---------------------------------------------------------------- > > > Patches intended for v4.12: > > > > > > * Some small fixes here and there; > > > * The usual cleanups and small improvements; > > > * Work to support A000 devices continues; > > > * New FW API version; > > > * Some debugging improvements; > > > > > > ---------------------------------------------------------------- > > > > This one has few conflicts. I can fix those manually, but can you give > > some guidance how? > > I think I got it now, see below for the diff I did. Can you please > check that? > > The resolution is also in the pending branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/log/?h=pending Yes, looks good! Thanks for resolving it and sorry for not foreseeing it to give you a heads up. -- Cheers, Luca. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-13 2017-04-18 8:22 ` Luca Coelho @ 2017-04-18 12:30 ` Kalle Valo 0 siblings, 0 replies; 5+ messages in thread From: Kalle Valo @ 2017-04-18 12:30 UTC (permalink / raw) To: Luca Coelho; +Cc: linux-wireless@vger.kernel.org, linuxwifi Luca Coelho <luca@coelho.fi> writes: > On Tue, 2017-04-18 at 06:56 +0000, Kalle Valo wrote: >> Kalle Valo <kvalo@codeaurora.org> writes: >> >> > Luca Coelho <luca@coelho.fi> writes: >> > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git >> > > tags/iwlwifi-next-for-kalle-2017-04-13 >> > > >> > > for you to fetch changes up to 87d0e1af9db3bff4ec2f68fd4d032f89c23867a4: >> > > >> > > iwlwifi: mvm: separate queue mapping from queue enablement >> > > (2017-04-11 15:25:00 +0300) >> > > >> > > ---------------------------------------------------------------- >> > > Patches intended for v4.12: >> > > >> > > * Some small fixes here and there; >> > > * The usual cleanups and small improvements; >> > > * Work to support A000 devices continues; >> > > * New FW API version; >> > > * Some debugging improvements; >> > > >> > > ---------------------------------------------------------------- >> > >> > This one has few conflicts. I can fix those manually, but can you give >> > some guidance how? >> >> I think I got it now, see below for the diff I did. Can you please >> check that? >> >> The resolution is also in the pending branch: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/log/?h=pending > > > Yes, looks good! Thanks for resolving it and sorry for not foreseeing it > to give you a heads up. Good, thanks. I pushed it to master branch now. -- Kalle Valo ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-18 12:30 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-04-13 12:34 pull-request: iwlwifi-next 2017-04-13 Luca Coelho 2017-04-18 6:34 ` Kalle Valo 2017-04-18 6:56 ` Kalle Valo 2017-04-18 8:22 ` Luca Coelho 2017-04-18 12:30 ` Kalle Valo
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).