Re: pull-request: iwlwifi-next 2017-08-18

Hi Kalle,

On Wed, 23 Aug 2017 18:21:51 +0300 Kalle Valo [off-list ref] wrote:

Luca Coelho [off-list ref] writes:
=20

quoted

Here's my third pull-request intended for v4.14.=C2=A0 We continued doi=

ng

quoted

generic development work, with improvements, bug fixes and=C2=A0cleanup=

s all

quoted

around.=C2=A0 More=C2=A0details 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" =

=20

=20
Thanks, I'll Cc Stephen because he most probably sees that conflict
tomorrow.

Thanks for the heads up ...

--=20
Cheers,
Stephen Rothwell