[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110915170715.a380a5be954efc5891386ee3@canb.auug.org.au>
Date: Thu, 15 Sep 2011 17:07:15 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Morris <jmorris@...ei.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Mimi Zohar <zohar@...ux.vnet.ibm.com>
Subject: linux-next: build failure after merge of the final tree (security
tree related)
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
Caused by commit 982e617a313b ("encrypted-keys: remove trusted-keys
dependency"). Forgot to include linux/err.h. See Rule 1 in
Documentation/SubmitChecklist.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 15 Sep 2011 17:03:09 +1000
Subject: [PATCH] encrypted-keys: IS_ERR need include/err.h
Fixes this build error:
security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
security/keys/encrypted-keys/masterkey_trusted.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c
index a5da512..df87272 100644
--- a/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/security/keys/encrypted-keys/masterkey_trusted.c
@@ -16,6 +16,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
+#include <linux/err.h>
#include <keys/trusted-type.h>
/*
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
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