* linux-next: manual merge of the usb tree with the vfs tree
@ 2012-05-01 5:04 Stephen Rothwell
2012-05-01 13:46 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-05-01 5:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Al Viro
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the usb tree with the vfs tree
2012-05-01 5:04 linux-next: manual merge of the usb tree with the vfs tree Stephen Rothwell
@ 2012-05-01 13:46 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2012-05-01 13:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Al Viro
On Tue, May 01, 2012 at 03:04:16PM +1000, Stephen Rothwell wrote:
> 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.
That sounds correct to me, thanks for doing this.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-01 13:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-01 5:04 linux-next: manual merge of the usb tree with the vfs tree Stephen Rothwell
2012-05-01 13:46 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).