[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <AANLkTimW1pwO468c2iHNvEdzt42b-O4PeAKUgqN_30Jk@mail.gmail.com>
Date: Thu, 5 Aug 2010 21:35:50 -0500
From: Steve French <smfrench@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-cifs@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, Wang Lei <wang840925@...il.com>,
David Howells <dhowells@...hat.com>
Subject: Re: linux-next: build failure after merge of the final tree (cifs
tree related)
The fix for the missing err.h include is merged. Not sure why I did
not run into that on my Ubuntu test builds or Dave on his builds.
Have not heard any feedback about the init.h change that Ben suggested yet.
On Wed, Aug 4, 2010 at 10:51 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Steve,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> net/dns_resolver/dns_key.c: In function 'init_dns_resolver':
> net/dns_resolver/dns_key.c:170: error: implicit declaration of function 'IS_ERR'
> net/dns_resolver/dns_key.c:171: error: implicit declaration of function 'PTR_ERR'
> net/dns_resolver/dns_query.c: In function 'dns_query':
> net/dns_resolver/dns_query.c:126: error: implicit declaration of function 'IS_ERR'
> net/dns_resolver/dns_query.c:127: error: implicit declaration of function 'PTR_ERR'
>
> Caused by commit bae8da144bd6254d1e9cec2a7d6da7cade84e00e ("DNS: Separate
> out CIFS DNS Resolver code").
>
> See Rule 1 in Documentation/SubmitChecklist.
>
> I have added this patch for today:
>
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 5 Aug 2010 13:49:29 +1000
> Subject: [PATCH] cifs: include linux/err.h for IS_ERR and PTR_ERR
>
> Fixes build errors:
>
> net/dns_resolver/dns_key.c: In function 'init_dns_resolver':
> net/dns_resolver/dns_key.c:170: error: implicit declaration of function 'IS_ERR'
> net/dns_resolver/dns_key.c:171: error: implicit declaration of function 'PTR_ERR'
> net/dns_resolver/dns_query.c: In function 'dns_query':
> net/dns_resolver/dns_query.c:126: error: implicit declaration of function 'IS_ERR'
> net/dns_resolver/dns_query.c:127: error: implicit declaration of function 'PTR_ERR'
>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
> net/dns_resolver/dns_key.c | 1 +
> net/dns_resolver/dns_query.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
> index 1b1b411..400a04d 100644
> --- a/net/dns_resolver/dns_key.c
> +++ b/net/dns_resolver/dns_key.c
> @@ -28,6 +28,7 @@
> #include <linux/string.h>
> #include <linux/kernel.h>
> #include <linux/keyctl.h>
> +#include <linux/err.h>
> #include <keys/dns_resolver-type.h>
> #include <keys/user-type.h>
> #include "internal.h"
> diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
> index 6c0cf31..b33e1f7 100644
> --- a/net/dns_resolver/dns_query.c
> +++ b/net/dns_resolver/dns_query.c
> @@ -39,6 +39,7 @@
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/dns_resolver.h>
> +#include <linux/err.h>
> #include <keys/dns_resolver-type.h>
> #include <keys/user-type.h>
>
> --
> 1.7.1
>
> --
> Cheers,
> Stephen Rothwell sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists