diff mbox series

linux-next: build failure after merge of the powerpc tree

Message ID 20200422154129.11f988fd@canb.auug.org.au (mailing list archive)
State Accepted
Commit 45591da765885f7320a111d290b3a28a23eed359
Headers show
Series linux-next: build failure after merge of the powerpc tree | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success Successfully applied on branch powerpc/merge (8299da600ad05b8aa0f15ec0f5f03bd40e37d6f0)
snowpatch_ozlabs/build-ppc64le success Build succeeded
snowpatch_ozlabs/build-ppc64be success Build succeeded
snowpatch_ozlabs/build-ppc64e success Build succeeded
snowpatch_ozlabs/build-pmac32 warning Upstream build failed, couldn't test patch
snowpatch_ozlabs/checkpatch warning total: 1 errors, 0 warnings, 0 checks, 8 lines checked
snowpatch_ozlabs/needsstable success Patch has no Fixes tags

Commit Message

Stephen Rothwell April 22, 2020, 5:41 a.m. UTC
Hi all,

After merging the powerpc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from <command-line>:32:
./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
   15 |  __u32 version;
      |  ^~~~~
./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
   16 |  __s16 vas_id; /* specific instance of vas or -1 for default */
      |  ^~~~~
./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
   17 |  __u16 reserved1;
      |  ^~~~~
./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
   18 |  __u64 flags; /* Future use */
      |  ^~~~~
./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
   19 |  __u64 reserved2[6];
      |  ^~~~~

Caused by commit

  45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")

uapi headers should be self contained.  I have added the following patch
for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Apr 2020 15:28:26 +1000
Subject: [PATCH] powerpc/vas: uapi headers should be self contained

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/include/uapi/asm/vas-api.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Haren Myneni April 22, 2020, 6:35 a.m. UTC | #1
Stephen, Sorry missed it. Thanks for fixing it.

Acked-by: Haren Myneni <haren@linux.ibm.com>

On 4/21/20 10:41 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from <command-line>:32:
> ./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
>    15 |  __u32 version;
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
>    16 |  __s16 vas_id; /* specific instance of vas or -1 for default */
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
>    17 |  __u16 reserved1;
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
>    18 |  __u64 flags; /* Future use */
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
>    19 |  __u64 reserved2[6];
>       |  ^~~~~
> 
> Caused by commit
> 
>   45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")
> 
> uapi headers should be self contained.  I have added the following patch
> for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 22 Apr 2020 15:28:26 +1000
> Subject: [PATCH] powerpc/vas: uapi headers should be self contained
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>> ---
>  arch/powerpc/include/uapi/asm/vas-api.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/powerpc/include/uapi/asm/vas-api.h b/arch/powerpc/include/uapi/asm/vas-api.h
> index fe95d67e3bab..ebd4b2424785 100644
> --- a/arch/powerpc/include/uapi/asm/vas-api.h
> +++ b/arch/powerpc/include/uapi/asm/vas-api.h
> @@ -6,6 +6,8 @@
>  #ifndef _UAPI_MISC_VAS_H
>  #define _UAPI_MISC_VAS_H
>  
> +#include <linux/types.h>
> +
>  #include <asm/ioctl.h>
>  
>  #define VAS_MAGIC	'v'
>
Michael Ellerman April 25, 2020, 11:52 p.m. UTC | #2
On Wed, 2020-04-22 at 05:41:29 UTC, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from <command-line>:32:
> ./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
>    15 |  __u32 version;
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
>    16 |  __s16 vas_id; /* specific instance of vas or -1 for default */
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
>    17 |  __u16 reserved1;
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
>    18 |  __u64 flags; /* Future use */
>       |  ^~~~~
> ./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
>    19 |  __u64 reserved2[6];
>       |  ^~~~~
> 
> Caused by commit
> 
>   45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")
> 
> uapi headers should be self contained.  I have added the following patch
> for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 22 Apr 2020 15:28:26 +1000
> Subject: [PATCH] powerpc/vas: uapi headers should be self contained
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/45591da765885f7320a111d290b3a28a23eed359

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/include/uapi/asm/vas-api.h b/arch/powerpc/include/uapi/asm/vas-api.h
index fe95d67e3bab..ebd4b2424785 100644
--- a/arch/powerpc/include/uapi/asm/vas-api.h
+++ b/arch/powerpc/include/uapi/asm/vas-api.h
@@ -6,6 +6,8 @@ 
 #ifndef _UAPI_MISC_VAS_H
 #define _UAPI_MISC_VAS_H
 
+#include <linux/types.h>
+
 #include <asm/ioctl.h>
 
 #define VAS_MAGIC	'v'