From patchwork Thu May 19 04:01:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9123791 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B1759F30C for ; Thu, 19 May 2016 04:01:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB9CA2024C for ; Thu, 19 May 2016 04:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFEA2022D for ; Thu, 19 May 2016 04:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750739AbcESEB0 (ORCPT ); Thu, 19 May 2016 00:01:26 -0400 Received: from ozlabs.org ([103.22.144.67]:49157 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750723AbcESEBZ (ORCPT ); Thu, 19 May 2016 00:01:25 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3r9HS26vLxz9vL6; Thu, 19 May 2016 14:01:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1463630483; bh=KWINEtBDutc3GlZu50OZwQvW0CJl4nzuzysqSAFSNG0=; h=Date:From:To:Cc:Subject:From; b=G22+jnBNi73cqCSrEEeNcbYezweKkMAto84+JbL9y1e5IjM5/6SsLl1x36swL5Rh4 UeCHQW61zgyCAp9OLLbxUBGxNk2X1U4jCdMu530PPElBBU2blg1ZMQKj95mdjofIyB ELqNzLQ99xR6sAucuyUWFRWEcTA6ItCbKmJLSpAs= Date: Thu, 19 May 2016 14:01:20 +1000 From: Stephen Rothwell To: James Morris , Steve French , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sachin Prabhu , David Howells Subject: linux-next: build failure after merge of the security tree Message-ID: <20160519140120.23b345a1@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi James, After merging the security tree, today's linux-next build (x86_64 allmodconfig) failed like this: fs/cifs/cifs_spnego.c: In function 'init_cifs_spnego': fs/cifs/cifs_spnego.c:206:12: error: too few arguments to function 'keyring_alloc' keyring = keyring_alloc(".cifs_spnego", ^ In file included from include/linux/cred.h:17:0, from include/linux/sched.h:56, from include/linux/kasan.h:4, from include/linux/slab.h:118, from fs/cifs/cifs_spnego.c:23: include/linux/key.h:302:20: note: declared here extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid, ^ Caused by commit 5b82c5cbcfe4 ("cifs: Create dedicated keyring for spnego operations") from the cifs tree interacting with commit 5ac7eace2d00 ("KEYS: Add a facility to restrict new links into a keyring") from the security tree. I added the following merge fix patch (and someone will have to let Linus know): From: Stephen Rothwell Date: Thu, 19 May 2016 13:45:10 +1000 Subject: [PATCH] cifs: fix for keyringalloc() API change Signed-off-by: Stephen Rothwell --- fs/cifs/cifs_spnego.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 248ab431930c..9ef0dfcb2f95 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -207,7 +207,7 @@ init_cifs_spnego(void) GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ, - KEY_ALLOC_NOT_IN_QUOTA, NULL); + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(keyring)) { ret = PTR_ERR(keyring); goto failed_put_cred;