This is a note to let you know that I've just added the patch titled
usb: gadget: f_fs: drop duplicate usb_functionfs_descs_head declaration
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-gadget-f_fs-drop-duplicate-usb_functionfs_descs_head-declaration.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Thu Oct 2 15:10:47 2014
From: Karol Lewandowski <[email protected]>
Date: Fri, 05 Sep 2014 21:04:44 +0200
Subject: usb: gadget: f_fs: drop duplicate usb_functionfs_descs_head declaration
To: [email protected]
Cc: [email protected], Karol Lewandowski <[email protected]>, Michal
Nazarewicz <[email protected]>, Felipe Balbi <[email protected]>, Greg Kroah-Hartman
<[email protected]>, [email protected]
Message-ID: <[email protected]>
Applicable for 3.14-stable only, as this revertes a previous commit that was
incorrect.
This commit drops duplicate declaration of struct usb_functionfs_descs_head
erronousely added in commit 28c5980b54 ("usb: gadget: f_fs: resurect
usb_functionfs_descs_head structure").
Fix from 28c5980b54 is applicable only for v3.15-rc1 and newer kernels.
This fixes error in uapi:
/src/linux$ make -C tools usb
make: Entering directory '/src/linux/tools'
DESCEND usb
make[1]: Entering directory '/src/linux/tools/usb'
gcc -Wall -Wextra -g -I../include -o testusb testusb.c -lpthread
gcc -Wall -Wextra -g -I../include -o ffs-test ffs-test.c -lpthread
In file included from ffs-test.c:41:0:
../../include/uapi/linux/usb/functionfs.h:42:8: error: redefinition of
‘struct usb_functionfs_descs_head’
struct usb_functionfs_descs_head {
^
../../include/uapi/linux/usb/functionfs.h:31:8: note: originally defined here
struct usb_functionfs_descs_head {
^
Cc: Michal Nazarewicz <[email protected]>
Cc: Felipe Balbi <[email protected]>
Signed-off-by: Karol Lewandowski <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
include/uapi/linux/usb/functionfs.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -27,24 +27,18 @@ struct usb_endpoint_descriptor_no_audio
__u8 bInterval;
} __attribute__((packed));
-/* 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));
/*
* All numbers must be in little endian order.
*/
+/* Legacy format, deprecated as of 3.14. */
struct usb_functionfs_descs_head {
__le32 magic;
__le32 length;
__le32 fs_count;
__le32 hs_count;
-} __attribute__((packed));
+} __attribute__((packed, deprecated));
/*
* Descriptors format:
Patches currently in stable-queue which might be from [email protected]
are
queue-3.14/usb-gadget-f_fs-drop-duplicate-usb_functionfs_descs_head-declaration.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
