From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A674C43381 for ; Wed, 27 Jan 2021 12:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B093120789 for ; Wed, 27 Jan 2021 12:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237917AbhA0MYV (ORCPT ); Wed, 27 Jan 2021 07:24:21 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:52419 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237410AbhA0MWF (ORCPT ); Wed, 27 Jan 2021 07:22:05 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DQjPs54tSz9sW8; Wed, 27 Jan 2021 23:21:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611750082; bh=UfNGUfM995PcFnJYUV9J9+OfoDl0+xLA7gSY70r/wZo=; h=Date:From:To:Cc:Subject:From; b=AN1UymtRunCn3A0AVoZM7xjRfpxDgBp+XmHdHyzJ/jqe7WWiBuB5DGxEb9GITw7kU ebxwUTfMxVTx/XbLryuRd19Y57ivBwe+PfOGVTMAReBpy5P+HicoKERQQGSltggWcB xNCAlxckpfaR2evmgYN9KTe2tJjOP6uIEUZYM0+eQN3QPC/Xg8rPrKHMKxXSjlcfiS U7rWNDv9J/4U8kb456S3WmI2Q/hcPFCqccWKQvsScp56ZnO3T+UwyuF5vkkXuaFg/n s0bGxpr6AQvFpVxLOEGN9KDZ3FrLryh4Ve2GXvSwKMeW5VgF+vM4oMKuCF2/BuiW5P m9i8uQlDRhv1w== Date: Wed, 27 Jan 2021 23:21:18 +1100 From: Stephen Rothwell To: Andrew Morton , Christian Brauner Cc: Alexey Dobriyan , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20210127232118.668e1bb3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Rc3+lbp0viBXaM=JShX5kEQ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Rc3+lbp0viBXaM=JShX5kEQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the akpm-current tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/ramfs/inode.c:175:13: error: initialization of 'int (*)(struct user_name= space *, struct inode *, struct dentry *, umode_t)' {aka 'int (*)(struct us= er_namespace *, struct inode *, struct dentry *, short unsigned int)'} from= incompatible pointer type 'int (*)(struct inode *, struct dentry *, umode_= t)' {aka 'int (*)(struct inode *, struct dentry *, short unsigned int)'} [-= Werror=3Dincompatible-pointer-types] 175 | .tmpfile =3D ramfs_tmpfile, | ^~~~~~~~~~~~~ fs/ramfs/inode.c:175:13: note: (near initialization for 'ramfs_dir_inode_op= erations.tmpfile') Caused by commit 5567a1a4b1c3 ("ramfs: support O_TMPFILE") interacting with commit 549c7297717c ("fs: make helpers idmap mount aware") from the pidfd tree. I have applied this merge fix patch: From: Stephen Rothwell Date: Wed, 27 Jan 2021 23:10:31 +1100 Subject: [PATCH] ramfs-support-O_TMPFILE-fix Signed-off-by: Stephen Rothwell --- fs/ramfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index b4a37102adf2..ba8e20584811 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -151,7 +151,8 @@ static int ramfs_symlink(struct user_namespace *mnt_use= rns, struct inode *dir, return error; } =20 -static int ramfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t= mode) +static int ramfs_tmpfile(struct user_namespace *mnt_userns, struct inode *= dir, + struct dentry *dentry, umode_t mode) { struct inode *inode; =20 --=20 2.29.2 --=20 Cheers, Stephen Rothwell --Sig_/Rc3+lbp0viBXaM=JShX5kEQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmARWr4ACgkQAVBC80lX 0GyKHAgAj4pN8wLjECk3xPLVb5K1dRflADXlYTEGz355Ym1PwNZO2nXlrNsOgnqd QMCARPEgSwCpK2uBpMmyax26XV7ZrOv7bYFDp4wwc1gD6P7abUYiOfjkMFeVxFx7 oJtnERYApfy5W7yHCCEEBx/cHtICS6hwRBdmw4PHW2qrv5s209NWNYfDICaWouuW zqZAp4mvbdz51QqRnuW595vsPGIZhTL+7TgAFxI2fpLye4sJdlQcdfcGOTPVR00e RMsqQJzpdwXSMWx9XxhWvsFGFiXUGM6KtA65RFVliyttb307kKtxA3fv2kTyPaH+ rB8JpJV3TyRZFdhuTvp/g2nS4N7FUg== =k15L -----END PGP SIGNATURE----- --Sig_/Rc3+lbp0viBXaM=JShX5kEQ--