Hi David,
Today's linux-next merge of the uwb tree got a conflict in
drivers/uwb/wlp/eda.c between commit
a20fd0a783551831bb6b9b69710e5bbb93dc2730 ("uwb: use the %pM formatting
specifier in eda.c") from Linus' tree and commit
bce83697c5fe84a7a5d38c96fbbe43b4bc028c3e ("uwb: use dev_dbg() for debug
messages") from the uwb tree.
The latter removed the some code that the former was modifying. I fixed
it up and can carry the fix for now.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpyEB4Mn9lq3.pgp
Description: PGP signature
