From nobody Sat Sep 13 22:08:25 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92F8FC54EAA for ; Mon, 30 Jan 2023 23:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230085AbjA3XOl (ORCPT ); Mon, 30 Jan 2023 18:14:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230058AbjA3XOi (ORCPT ); Mon, 30 Jan 2023 18:14:38 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CDD81CAEF; Mon, 30 Jan 2023 15:14:31 -0800 (PST) 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 4P5PC95lNtz4x1d; Tue, 31 Jan 2023 10:14:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675120470; bh=1NPCECl8cFvSKrhix1qJjN0ZBmuleVasqwSfFxjJOQc=; h=Date:From:To:Cc:Subject:From; b=IsR3sChAJkHQFoG60SBLza3p6WGbXEESoICU7jTuaRqZ6mN03MACFwGIpki3O/uU0 AVEwMpKEgCG/qqoT4dzZXkTKUnLt4ZQiaShzJZZSKZ0TT+XcKVu5Uh7Y8GPvQe/nak Mb67Z6LiYm6FGMjoTdrvOKyDlBrH12nOzk+0JUhals3ESpkkNiBeYsj0No+4qpa0tw Nosh9mfXimwPfbokIRerFiEvanq0IjuT6h58GK0VqFVzZrfxizwZu7KFMyCYjPd1hl j1N1oMjkhywPKIFSkS8Omdp6cOf1puX/FNEh2b0drHmLkU3zKyyr6oVvFDO1rlVybn 7gMcHULAa6Jzg== Date: Tue, 31 Jan 2023 10:12:44 +1100 From: Stephen Rothwell To: Jaegeuk Kim , Christian Brauner , Seth Forshee Cc: Chao Yu , Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the f2fs tree with the vfs-idmapping tree Message-ID: <20230131101244.26f85f35@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Jy=oOH1dTIlGK12s8WfgmxL"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Jy=oOH1dTIlGK12s8WfgmxL Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the f2fs tree got a conflict in: fs/f2fs/namei.c between commit: f2d40141d5d9 ("fs: port inode_init_owner() to mnt_idmap") from the vfs-idmapping tree and commit: 8abe4be45132 ("f2fs: remove unneeded f2fs_cp_error() in f2fs_create_white= out()") from the f2fs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc fs/f2fs/namei.c index d8e01bbbf27f,82923273f4bb..000000000000 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@@ -923,13 -923,10 +923,10 @@@ static int f2fs_tmpfile(struct mnt_idma return finish_open_simple(file, err); } =20 -static int f2fs_create_whiteout(struct user_namespace *mnt_userns, +static int f2fs_create_whiteout(struct mnt_idmap *idmap, struct inode *dir, struct inode **whiteout) { - if (unlikely(f2fs_cp_error(F2FS_I_SB(dir)))) - return -EIO; -=20 - return __f2fs_tmpfile(mnt_userns, dir, NULL, + return __f2fs_tmpfile(idmap, dir, NULL, S_IFCHR | WHITEOUT_MODE, true, whiteout); } =20 --Sig_/Jy=oOH1dTIlGK12s8WfgmxL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPYTuwACgkQAVBC80lX 0GwBagf/TGt9UbacvbykFcjl7F9l9hxIQmz028e7wYvp1YX5thIU8sK4rI/VZcCA 7GfzNxj5xzBW7GkMJN1Lnb62VW9N39Y1891h/1b2neQQb8MG6COK1tEvCVYFmUoQ DN42Ili9ryjpwNkXl3VwTljuDw4eXRjS0oeKftYIAP6NBRrkWSY6jz6VCMbuvc8j x8q/tVve8ooNztrxHPTnHNQGl1Dba+dO9xg07o/kj7QmX+gLBhRFIsoqlwQ0EuLI rbe3YZtRCCLR3AekEhxryhoecEAiqRvqLds2jwDCjnNUVvza83gJX8KwW5WWrhDO ZXgWJc+rZ64cUX7z1sX3vAO4ozkD5w== =KBPc -----END PGP SIGNATURE----- --Sig_/Jy=oOH1dTIlGK12s8WfgmxL--