From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michal Nazarewicz <mina86@mina86.com>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Thu, 17 Jul 2014 16:52:38 +1000 [thread overview]
Message-ID: <20140717165238.2e056cba@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]
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@canb.auug.org.au
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-17 6:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 6:52 Stephen Rothwell [this message]
2014-07-17 15:05 ` linux-next: manual merge of the usb-gadget tree with Linus' tree Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2020-01-10 4:32 Stephen Rothwell
2020-01-14 8:41 ` Geert Uytterhoeven
2020-01-14 9:17 ` Pawel Laszczak
2020-01-15 3:40 ` Stephen Rothwell
2020-01-15 6:56 ` Felipe Balbi
2017-06-13 6:11 Stephen Rothwell
2014-09-08 7:13 Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi
2014-09-08 7:06 Stephen Rothwell
2013-08-01 5:32 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140717165238.2e056cba@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mina86@mina86.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).