Messages in this thread | | | Date | Thu, 17 Jul 2014 10:05:19 -0500 | From | Felipe Balbi <> | Subject | Re: linux-next: manual merge of the usb-gadget tree with Linus' tree |
| |
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 [unhandled content-type:application/pgp-signature] | |