Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
drivers/hid/hid-core.c between commits
8390887fae55be9c06e3f064464d2bc8e908b8df ("HID: autosuspend support for
USB HID") and 76bb16394583f56c14cc90dc3746178d67eb5ed8 ("HID: remove
compat stuff") from the hid tree and commit
73a2ee6c5e4cff36772564f8150890ceaca776fb ("use the new
request_module_nowait() in the hid driver") from the rr tree.
Just overlapping removes/additions. I fixed it up and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp51t6tWzXKt.pgp
Description: PGP signature
