On Tue, 17 Feb 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the rr tree got a conflict in
> drivers/hid/hid-core.c between commit
> 8390887fae55be9c06e3f064464d2bc8e908b8df ("HID: autosuspend support for
> USB HID") from the hid tree and commit
> c7b902168e6b06e91033bfaf71ca0174ad66c6aa ("use the new
> request_module_nowait() in the hid driver") from the rr tree.
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yes, please do carry the fix, thanks a lot. It doesn't make a lot of sense
if I take the patch from Rusty into my tree, as the changes depend on
other patches in Rusty's tree.
Thanks,
--
Jiri Kosina
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
