On Fri, 2020-01-24 at 16:45 +0200, Kalle Valo wrote: > Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: > > > Luca Coelho <luca@xxxxxxxxx> writes: > > > > > Here's the fist batch of patches intended for v5.6. This includes > > > the last two patchsets I sent out. Usual development work. More > > > details about the contents in the tag description. > > > > > > I pushed these patches to my pending branch, but it was just now, so I > > > didn't get the results from kbuildbot yet. > > > > > > Please let me know if there are any issues. > > > > > > Cheers, > > > Luca. > > > > > > > > > The following changes since commit ae0a723c4cfd89dad31ce238f47ccfbe81b35b84: > > > > > > Merge ath-next from > > > git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git > > > (2019-12-19 18:27:36 +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-2020-01-11 > > > > > > for you to fetch changes up to 0b295a1eb81f37dc7d4f4f2ee9ef375fb36ab5d8: > > > > > > iwlwifi: add device name to device_info (2020-01-04 12:48:41 +0200) > > > > > > ---------------------------------------------------------------- > > > First set of patches intended for v5.6 > > > > > > * Support new versions of the FTM FW APIs; > > > * Fix an old bug in D3 (WoWLAN); > > > * A couple of fixes/improvements in the receive-buffers code; > > > * Fix in the debugging where we were skipping one TXQ; > > > * Support new version of the beacon template FW API; > > > * Print some extra information when the driver is loaded; > > > * Some debugging infrastructure (aka. yoyo) updates; > > > * Support for a new HW version; > > > * Second phase of device configuration work started; > > > * Some clean-ups; > > > > > > ---------------------------------------------------------------- > > > > There was a conflict in pcie/drv.c due to this commit: > > > > db5cce1afc8d Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection" > > > > Please double check my resolution in the pending branch: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?h=pending&id=5e01e8338c9d741dbf473a56f753b9c12344432d > > > > I just took the hunk from commit db5cce1afc8d and didn't do any other > > changes. > > Wrong link obviously, it should be this one: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?h=pending&id=8dd96ed75b07e0134df24333c5766cf656af60af > Looks good! Thanks for resolving it, Kalle! -- Cheers, Luca.