Re: linux-next: manual merge of the usb-gadget tree with the vfs tree

[Robert Baldyga]

On 09/17/2014 08:16 AM, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/function/f_fs.c between commit 8322215aa91c ("f_fs:
> saner API for ffs_sb_create_file()") from the vfs tree and commit
> 1b0bf88fd8b8 ("usb: gadget: f_fs: virtual endpoint address mapping")
> from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Looks good for me.

Thanks
Robert Baldyga
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/