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

Felipe Balbi
2014-07-17T15:05:45Z

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On Thu, Jul 17, 2014 at 04:52:38PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb:
> gadget: f_fs: resurect usb_functionfs_descs_head structure") from
> Linus' tree and commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors
> support") from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks that is the correct fix :-)

--
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]