Messages in this thread |  | | | Date | Tue, 1 May 2012 15:04:16 +1000 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the usb tree with the vfs tree |
| |
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@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |