Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp1290365lqj; Mon, 3 Jun 2024 17:12:51 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXHl2oLvCSFNyvf84nGqFDufUJ2Juc+aVS3F35XtDmagnWci4JoVz4UKV0rj3ExL2ZStVG/zUNJknfl+wu3BFpBaZsE07ScH2B3vuS3qQ== X-Google-Smtp-Source: AGHT+IHIRlcvDoO27BvEBsI4Z2n6SjkomR+CGFuh3n26y64Sl+9c3mER28Mc766iNwAV8zaO7s+8 X-Received: by 2002:a17:90a:ac16:b0:2c1:9c10:8b87 with SMTP id 98e67ed59e1d1-2c1dc590988mr8778139a91.29.1717459971135; Mon, 03 Jun 2024 17:12:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717459971; cv=pass; d=google.com; s=arc-20160816; b=C+MyJ32OV0UAY5hzNgJF1HXrHSeDopbO1VsEiDJhmVNE3IZndnDw0XYgW8Zp3pHeTG /Dt+6Oe/MtODoQ9dbt08WnBUrdv9OhxN7BrMwuk0F2+8jFqxZgnESiL3pQSRVuUqzeal P/N+0kd7cF1FJuzx2IfsSfIc3kq2C8zwsli8T9QrlIMu1xEaTOsl60Hqdjy2FNcL52QJ iMOs1G7rDT+eTr8btqWL8zUrr5ZMmrbNFY6X66tnal4tjg0La3hqduD3WdaHy9GwejKY w0ZAlSVSWPVWpGgRyzzZXH9mBrbFTKFSihWhBSmoBmLRmG8uv6C6Iblu4jYx+fevbqrp MDjA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=Hv0tTCtGNRDz4IxQxUCsS/WiWb2yQMgR724fsyR9A5U=; fh=T+dPu8EVoZbn14mr5EDmKZyUwaSL5pWVQZK3jJboTN4=; b=ChWIlcu33PABIPN2ZXgNq/Qu6HUPgIi5HOp6OfUrjqYqLKuDRUCrK1ywIfjE5cn9Yj hsRB3HNt5bwI4g3Hk0/t7DB7CU4IpCEwkmTagnYrrYoCEo2DCSb6oglHaKBOxuMEVB2Q OT1YCLfTmlZ3idG4CRD50oMbOgLUYXSfPxNWj38ztK/OBePERcz4UqSLLxKtC8VqebeG if5dcd17hl1J//3fYEMSTJC1tsZ7nfk18q+pzAAmrZwIm807Cy7ddp25zNOVBD6uxoKI Dsh7VNFQctpcx5+KPJ3G6T1VidIHW07dv6Vgrob5r0ZoYnqJtdwH0L3CMNMFjDTBHtFp yRag==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=B5wRju2R; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-199861-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199861-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c1c27a8c0bsi7291032a91.8.2024.06.03.17.12.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 17:12:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-199861-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=B5wRju2R; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-199861-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199861-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E020F286423 for ; Tue, 4 Jun 2024 00:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2779D633; Tue, 4 Jun 2024 00:12:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="B5wRju2R" Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24BAC372; Tue, 4 Jun 2024 00:12:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717459935; cv=none; b=RXPPR6vs7KhKhvBEqmapecNmCrwuAm7YphhsUOmnl644uWcoUIEGtPSiuQ9YMLTmtR74Fc5cdDtpn5hURwwHGuWtP7TvhIuneZNY34axPvn9GgsCeH/g/svas6UX2BaPYtxnWMA9mJuim/sECk4bpFfBVYhwFuYOJjy9tNV7f3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717459935; c=relaxed/simple; bh=DT6ZriKLDL2/nkp1V6B9kkq6e9Nx7cAlrQKpuP7m2z8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=A3d/12H+UixCFvkiAyjF52lEBI50dNSCVzqu/XMhGCzDk+wIgEeuhOcxpYFwF4toa7Ut+cFYgYye6N7YbefsspmM3Wby/LyZI8+nRDnNHEj35/jQUvQ4I+Qmt9F+I4cFlJOT3DEAbyJSrs9a8zxgEMkdLS4Jn4VWgTEDm2TrY1A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=B5wRju2R; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1717459931; bh=Hv0tTCtGNRDz4IxQxUCsS/WiWb2yQMgR724fsyR9A5U=; h=Date:From:To:Cc:Subject:From; b=B5wRju2RCadGD9C1LieOsF+KIgLpzMiS/sbS8g0GZUXyb4NrqCE0ECWN90qmt5S18 CPaIJsmnfmkA0Qija6N3fXjUkHN4fYQC+88fFV3RN9JzwwrTE6+VGUsTTpJpwJkdpl xa98A9pDHsPDCkGU1dxwPfGf6Pg/Q4QLPJKz6u8QYMdMc7tZq6+Tc96lW4P5oMcMeq IP40DbEc0zhFPzVZZTRVG8ENBZfBRGTc2je9GtLCUQuxLJTAI3OsE6soo7PpAmL306 e7fjGPe99T47t4D5tzkRFjVVcsxOoRpFPN2mBxcwPsKu1MdmMAVwTjsgBFX23AOBGo VQDCtECe7xkrA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4VtWHZ1XLvz4wcC; Tue, 4 Jun 2024 10:12:10 +1000 (AEST) Date: Tue, 4 Jun 2024 10:12:09 +1000 From: Stephen Rothwell To: Christian Brauner , Trond Myklebust Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" , Sagi Grimberg , Trond Myklebust Subject: linux-next: manual merge of the vfs-brauner tree with the nfs tree Message-ID: <20240604101209.5134a47c@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/mWXFnTaouDl+lVyq184KVFe"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/mWXFnTaouDl+lVyq184KVFe Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/nfs/symlink.c between commit: 134d0b3f2440 ("nfs: propagate readlink errors in nfs_symlink_filler") from the nfs tree and commit: 8f3ab6e4bebe ("nfs: Remove calls to folio_set_error") from the vfs-brauner tree. I fixed it up (the latter included the change from thr former) 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 --Sig_/mWXFnTaouDl+lVyq184KVFe Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZeW9kACgkQAVBC80lX 0GyseQgAifD+kLQSzJafL8CzUlOJnZ8aaDlMnYWiYWV7qFU0WoRHtuuastr75VND lMBUmpA4BjbIOUgDokjNHD4RNAOJZ25PsG/0ZE3ng1drpt5+ZSnUC4akstX/W4hi /IHlyOA4Cnk7gMCNURTexGUyh7NMWHsyojHuqn6LayiLlYZGAf8y0dQbxeFIKAVH AUtq8Jtj9/BQABJ6z22+VCE5xLo8ZP1LkR1QFKMqIBczdWr2NeUUK8uh4ofz75lp qZavCw4inWZjTYvikddg7tQH3io/6Q5IYlF0U9DUtVVFAd7+Y4tNliW1GXYRE1b4 OH1foVBJ2fEDZe/Q+kZc9Lr92yTtkA== =AOPI -----END PGP SIGNATURE----- --Sig_/mWXFnTaouDl+lVyq184KVFe--