From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754580AbcESKLy (ORCPT ); Thu, 19 May 2016 06:11:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59327 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753910AbcESKLw (ORCPT ); Thu, 19 May 2016 06:11:52 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20160519140120.23b345a1@canb.auug.org.au> References: <20160519140120.23b345a1@canb.auug.org.au> To: Stephen Rothwell Cc: dhowells@redhat.com, James Morris , Steve French , linux-cifs@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sachin Prabhu Subject: Re: linux-next: build failure after merge of the security tree MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <12306.1463652709.1@warthog.procyon.org.uk> Date: Thu, 19 May 2016 11:11:49 +0100 Message-ID: <12307.1463652709@warthog.procyon.org.uk> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 19 May 2016 10:11:52 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell wrote: > 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; This looks correct. David