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

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/uapi/linux/usb/functionfs.h
index 24b68c59dcf8,b66fae77c08c..000000000000
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@@ -33,14 -32,37 +32,45 @@@ struct usb_endpoint_descriptor_no_audi
  	__u8  bInterval;
  } __attribute__((packed));
  
+ /* MS OS Descriptor header */
+ struct usb_os_desc_header {
+ 	__u8	interface;
+ 	__le32	dwLength;
+ 	__le16	bcdVersion;
+ 	__le16	wIndex;
+ 	union {
+ 		struct {
+ 			__u8	bCount;
+ 			__u8	Reserved;
+ 		};
+ 		__le16	wCount;
+ 	};
+ } __attribute__((packed));
+ 
+ struct usb_ext_compat_desc {
+ 	__u8	bFirstInterfaceNumber;
+ 	__u8	Reserved1;
+ 	__u8	CompatibleID[8];
+ 	__u8	SubCompatibleID[8];
+ 	__u8	Reserved2[6];
+ };
+ 
+ struct usb_ext_prop_desc {
+ 	__le32	dwSize;
+ 	__le32	dwPropertyDataType;
+ 	__le16	wPropertyNameLength;
+ } __attribute__((packed));
+ 
+ #ifndef __KERNEL__
+ 
 +/* Legacy format, deprecated as of 3.14. */
 +struct usb_functionfs_descs_head {
 +	__le32 magic;
 +	__le32 length;
 +	__le32 fs_count;
 +	__le32 hs_count;
 +} __attribute__((packed, deprecated));
 +
  /*
   * Descriptors format:
   *

Attachment: signature.asc
Description: PGP signature