Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 27 Jan 2021 23:21:18 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Christian Brauner <christian.brauner@ubuntu.com>
Cc:     Alexey Dobriyan <adobriyan@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
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

--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 <sfr@canb.auug.org.au>
Date: Wed, 27 Jan 2021 23:10:31 +1100
Subject: [PATCH] ramfs-support-O_TMPFILE-fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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--