Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/inode.c between commit eaf5fb5977e0 ("switch usbfs to
use of simple_{unlink,rmdir}") from the tree and commit fb28d58b72aa
("USB: remove CONFIG_USB_DEVICEFS") from the usb tree.
The latter removes the file modified by the former, so I just removed the
file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpPLa7895uvF.pgp
Description: PGP signature
