Luca Coelho <luca@xxxxxxxxx> writes: > Here's my third pull-request intended for v4.14. We continued doing > generic development work, with improvements, bug fixes and cleanups all > around. More details in the tag description. > > My patch "iwlwifi: update channel flags parser" is going to cause a > conflict with net because they both change the same string in debug > message. Emmanuel's patch "iwlwifi: split the regulatory rules when the > bandwidth flags require it" added "reg_flags" to the string and changed > the Ad-hoc string. My patch added a few %s's and also changed the Ad- > hoc string. The result of the conflict resolution should look like > this: > > "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n" Thanks, I'll Cc Stephen because he most probably sees that conflict tomorrow. > 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 38ef62353acbaa0eea062a9f047b33aebd7d52ce: > > rsi: security enhancements for AP mode (2017-08-17 10:07:00 +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-08-18 > > for you to fetch changes up to 8fe34b060a4b11be35ffd9383acdd0bc7bee72e2: > > iwlwifi: use big-endian for the hw section of the nvm (2017-08-18 17:36:42 +0300) > > ---------------------------------------------------------------- > Third set of iwlwifi patches for 4.14 > > * Work for the upcoming A000 device family continues; > * Improvements in debugging; > * A couple of improvements in block-ack sessions; > * Some fixes for channel switch; > * A workaround for a HW data bug; > * Some FW API updates; > * General fixes and cleanups here and there. > > ---------------------------------------------------------------- Pulled, thanks. -- Kalle Valo
