Hi Kalle, On Wed, 23 Aug 2017 18:21:51 +0300 Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > > 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. Thanks for the heads up ... -- Cheers, Stephen Rothwell
