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 A05CBC61DA4 for ; Wed, 22 Feb 2023 12:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231625AbjBVMNu (ORCPT ); Wed, 22 Feb 2023 07:13:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbjBVMNs (ORCPT ); Wed, 22 Feb 2023 07:13:48 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D705B7A87; Wed, 22 Feb 2023 04:13:45 -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 4PMFS41Nh5z4x7W; Wed, 22 Feb 2023 23:13:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1677068021; bh=CCCioTOAL95lINYsTc0QjL/cyM1/Zvh2V1qPLfQyFGk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SRhKyWt94W4krAAzBoj1L28ZgJYnMDgOjaTAYe6Tda/8TOSbtiTmlilRuzHDv6MYL 1CZvEjFFv8fANoaBud0knqTmCxqt/iyMO8OILAOh3WymsO51T8Wp9sO0EL6TigIdb9 6AwVbP958lhs/YVzMmjBkKZceS5tBFDIbY/3ZIT5u1vA6+2wAos48KJvr+7u1lZYqn eqB7/RZ7xFsFDAr05lyXspmDZJLEYjFLQSucIQNHHZ3Rei0yqylS8sWPkXbXdgF0pQ UB84pfphYOzHlFrb8AcuARmCN32XPGsl9eUZilYUZKswJIb+wtWZt4Ej8LNCqd+bcq KB3EY5p+iN4TA== Date: Wed, 22 Feb 2023 23:13:37 +1100 From: Stephen Rothwell To: David Howells Cc: Matthew Wilcox , "Vishal Moola (Oracle)" , Andrew Morton , Steve French , Steve French , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Paulo Alcantara , Jeff Layton , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Subject: Re: linux-next: manual merge of the mm-stable tree with the cifs tree Message-ID: <20230222231337.3316440a@canb.auug.org.au> In-Reply-To: <3325858.1677054470@warthog.procyon.org.uk> References: <20230222134927.459b036b@canb.auug.org.au> <20230221184225.0e734f0e@canb.auug.org.au> <20230221174401.7198357d@canb.auug.org.au> <20230220152933.1ab8fa4a@canb.auug.org.au> <20230220190157.3b43b9a7@canb.auug.org.au> <2351091.1676963957@warthog.procyon.org.uk> <2885897.1676990364@warthog.procyon.org.uk> <3325858.1677054470@warthog.procyon.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ygwXD6lRg3GxyS/ln.n=Vs_"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/ygwXD6lRg3GxyS/ln.n=Vs_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi David, On Wed, 22 Feb 2023 08:27:50 +0000 David Howells wrot= e: > > Stephen Rothwell wrote: >=20 > > OK, so in the merge of mm-stable, I used the cifs version of > > fs/cifs/file.c with this patch applied. The merge resolution for that > > file looks like this: =20 >=20 > I checked it out and diffed it against mine. Looks right, thanks! Thanks for checking. --=20 Cheers, Stephen Rothwell --Sig_/ygwXD6lRg3GxyS/ln.n=Vs_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmP2BvEACgkQAVBC80lX 0GxcWwf9HniWWVZROA72eHBznLGITsOKf6EmTYN1iQenlMOublvbyQroPeBnEPSa Vm3Mv7a218GPpHnej7JrrndfFJa1s/7f7yHVx7z7wI153rtPc1gFYBgSxKeorgbg sO94YGKRp6D3Ro0XOJgmSky+ScVUY2d5YbbogN/YGrZcQz59SkFh4bm8/VG/bvEB ZJymKCVTugr4tRLxPCD/Tw7XDZgspbxfRSFrXZTMpe21xNHL7WNuuNZZAAKNH/33 slGBsGZ07LV6LULGyYYN/9lpB5esiGOfGTy4X0VpmppItjEm/SC8a3QabKgv0eCF KfK3pShbs+G67Xy07ywDgAgmST7JKQ== =gpVM -----END PGP SIGNATURE----- --Sig_/ygwXD6lRg3GxyS/ln.n=Vs_--