Luca Coelho <luca@xxxxxxxxx> wrote: > Hi Kalle, > > Here's my first pull request for v5.17 with the three patchsets I sent > earlier, plus a few patches to fix small issues introduced when iwlmei > was merged and a couple of other patches sent by the community some > time ago that were still pending. > > Otherwise this is all normal development, new features, bugfixes and > cleanups. More details about the contents in the tag description. > > Please let me know if there are any issues. > > Cheers, > Luca. > > > The following changes since commit fe6db7eda9306d665f7b8fc3decdb556ec10fb85: > > iwlwifi: mei: fix linking when tracing is not enabled (2021-12-05 13:55:15 +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-2021-12-08 > > for you to fetch changes up to 977df8bd5844c9370c26a9477418165b870da27c: > > iwlwifi: work around reverse dependency on MEI (2021-12-07 20:18:06 +0200) > > ---------------------------------------------------------------- > first set of iwlwifi patches for v5.17 > > * A few mei fixes; > * Some improvements in D3; > * Support for new FW API commands; > * Fixes and cleanups in device configurations; > * Support some new FW API command versions; > * Fix WGDS revision 3 reading bug; > * Some firmware debugging improvements; > * Fixes for in device configuration structures; > * Improvements in the session protection code; > * Support SAR GEO Offset Mapping (SGOM) via BIOS; > * Continued work on the new Bz device family; > * Some more firmware debugging improvements; > * Support new FW API version 68; > * Add some new device IDs; > * Some other small fixes, clean-ups and improvements. There's a conflict: CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mvm.h <<<<<<< HEAD IWL_MVM_STATUS_STARTING, ======= IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE, >>>>>>> fb6b74def69548fe5854bf902108ec5e4afa9ef6 I assume both enums should be included and STATUS_STARTING should be first. Do let me know if I should fix it somehow differently. -- https://patchwork.kernel.org/project/linux-wireless/patch/0ee53b7977ca2cd1c1d5deb100fb9cdbfe2acd0b.camel@xxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches