Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1225658 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-09-16 03:40 +0200 |
| Last post | 2015-09-16 07:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-16 03:40 +0200
Re: linux-next: build failure after merge of the tip tree David Miller <davem@davemloft.net> - 2015-09-16 07:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-09-16 03:40 +0200 |
| Subject | linux-next: build failure after merge of the tip tree |
| Message-ID | <q99Rw-6uQ-5@gated-at.bofh.it> |
Hi all,
After merging the next-20150915 version of the tip tree, today's
linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/usb/gadget/function/u_ether.h:20:0,
from drivers/usb/gadget/function/f_ncm.c:26:
include/linux/usb/cdc.h:23:8: error: redefinition of 'struct usb_cdc_parsed_header'
struct usb_cdc_parsed_header {
^
In file included from drivers/usb/gadget/function/f_ncm.c:24:0:
include/linux/usb/cdc.h:23:8: note: originally defined here
struct usb_cdc_parsed_header {
^
In file included from drivers/usb/gadget/function/u_ether.h:20:0,
from drivers/usb/gadget/function/f_ncm.c:26:
include/linux/usb/cdc.h:44:5: error: conflicting types for 'cdc_parse_cdc_header'
int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
^
In file included from drivers/usb/gadget/function/f_ncm.c:24:0:
include/linux/usb/cdc.h:44:5: note: previous declaration of 'cdc_parse_cdc_header' was here
int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
^
In file included from drivers/usb/gadget/function/u_serial.h:16:0,
from drivers/usb/gadget/legacy/cdc2.c:17:
include/linux/usb/cdc.h:23:8: error: redefinition of 'struct usb_cdc_parsed_header'
struct usb_cdc_parsed_header {
^
In file included from drivers/usb/gadget/function/u_ether.h:20:0,
from drivers/usb/gadget/legacy/cdc2.c:16:
include/linux/usb/cdc.h:23:8: note: originally defined here
struct usb_cdc_parsed_header {
^
In file included from drivers/usb/gadget/function/u_serial.h:16:0,
from drivers/usb/gadget/legacy/cdc2.c:17:
include/linux/usb/cdc.h:44:5: error: conflicting types for 'cdc_parse_cdc_header'
int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
^
In file included from drivers/usb/gadget/function/u_ether.h:20:0,
from drivers/usb/gadget/legacy/cdc2.c:16:
include/linux/usb/cdc.h:44:5: note: previous declaration of 'cdc_parse_cdc_header' was here
int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
^
Caused by commit
c40a2c8817e4 ("CDC: common parser for extra headers")
from the net-next tree that added include/linux/usb/cdc.h with no
reinclusion guards.
I am not sure why I did not see this failure when building after
merging the net-next tree. Maybe it is exposed by some config change
in the tip tree?
I have added the following fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Sep 2015 11:10:16 +1000
Subject: [PATCH] cdc: add header guards
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/usb/cdc.h | 4 ++++
include/uapi/linux/usb/cdc.h | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index 959d0c838113..b5706f94ee9e 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -7,6 +7,8 @@
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*/
+#ifndef __LINUX_USB_CDC_H
+#define __LINUX_USB_CDC_H
#include <uapi/linux/usb/cdc.h>
@@ -45,3 +47,5 @@ int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
struct usb_interface *intf,
u8 *buffer,
int buflen);
+
+#endif /* __LINUX_USB_CDC_H */
diff --git a/include/uapi/linux/usb/cdc.h b/include/uapi/linux/usb/cdc.h
index b6a9cdd6e096..e2bc417b243b 100644
--- a/include/uapi/linux/usb/cdc.h
+++ b/include/uapi/linux/usb/cdc.h
@@ -6,8 +6,8 @@
* firmware based USB peripherals.
*/
-#ifndef __LINUX_USB_CDC_H
-#define __LINUX_USB_CDC_H
+#ifndef __UAPI_LINUX_USB_CDC_H
+#define __UAPI_LINUX_USB_CDC_H
#include <linux/types.h>
@@ -444,4 +444,4 @@ struct usb_cdc_ncm_ndp_input_size {
#define USB_CDC_NCM_CRC_NOT_APPENDED 0x00
#define USB_CDC_NCM_CRC_APPENDED 0x01
-#endif /* __LINUX_USB_CDC_H */
+#endif /* __UAPI_LINUX_USB_CDC_H */
--
2.5.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2015-09-16 07:00 +0200 |
| Message-ID | <q9cZ4-2Bi-7@gated-at.bofh.it> |
| In reply to | #1225658 |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 16 Sep 2015 11:30:53 +1000 > I have added the following fix patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Wed, 16 Sep 2015 11:10:16 +1000 > Subject: [PATCH] cdc: add header guards > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied, thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web