Received: by 2002:a05:7412:98c1:b0:fa:551:50a7 with SMTP id kc1csp413776rdb; Fri, 5 Jan 2024 14:34:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IEgVhYwLSmWWvyrQUXhYXffy/VxKYevzmJJSrOys+tRoc9wejD8+wTP0AnE78wqVP9veNzl X-Received: by 2002:a17:90a:398f:b0:28c:afd9:5805 with SMTP id z15-20020a17090a398f00b0028cafd95805mr239637pjb.27.1704494048919; Fri, 05 Jan 2024 14:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704494048; cv=none; d=google.com; s=arc-20160816; b=ONmZdmFnzsZHdG1WUDz4nm5U1lQ9LpqjkymgVPiNR5tfqcSQ8msYIm4S+p3SbX8I5n XhsFMVgmZEBd4xabXW5Iiy/uZkhswYJRFsAAPbBcDSvqFN3qnDXzOoVK/NrJ4KbDZhvX wniwbwhtsh47qcikzT3Kp1x2xK3MQ1g7CLUQhxR2vP8z1PMFByEsup3xNTHDUYXky3ec 47lCVYyL+kvfjDAMHX3Pq0Gqf3RAoXUDLbWxSNfIP/JMMv595RipzYM2GLL7migO9yNl e2bQyUaFOcX4ON51JD/Eyk7Z7aCJ0bqhpXruAtfB0hSunENcZBko2yB3FEimha1bxdYp h/JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=rpezY7E7ZYFhLGmpW92hvMon9DAaxzXvUdwXft+X8tc=; fh=sIvEq0NsstD4EEueBiHK/4EQehJ/Gc/Ni5QHgTe5ZfE=; b=sEQXQxh/IEsu/a2hvtO1U8/hT4esrzbLJUvle8w/J1aNY1t/fjJKT7zS3UAkzfEOT+ yG2844HuDzGCbwHy4eSty63dNat5yxY85u/TIVDWkb7Tz0g6YREBQsXxdOeWBS8ewli3 kR2ju+7fuaQ8Y+vvkFtxFZQeKcnpbioepyi50UKUQYRvJSzGCETM6V9odS6dBprh9yxW ywKKDe2Gv3ZDS/LNTNG7FA3h7kubG1/BdBN48pmCaYXDAQRijcDtffn3bA4qX97qv9xR 025iOd0TCvRBO2nQiQsXWv2PQeNq3NjaX1w4e8wHCxvvMonNF29oFWLcDKB1kU0XHlbT TxZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=UvCy5qCH; spf=pass (google.com: domain of linux-kernel+bounces-18400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18400-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 sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id u5-20020a17090ae00500b002865ae767cesi1426584pjy.172.2024.01.05.14.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 14:34:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=UvCy5qCH; spf=pass (google.com: domain of linux-kernel+bounces-18400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18400-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 7453CB23510 for ; Fri, 5 Jan 2024 22:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED1AF360B2; Fri, 5 Jan 2024 22:33:57 +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="UvCy5qCH" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.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 76BF03609A; Fri, 5 Jan 2024 22:33:51 +0000 (UTC) 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=1704494029; bh=rpezY7E7ZYFhLGmpW92hvMon9DAaxzXvUdwXft+X8tc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UvCy5qCHEgsGakVwoutRV0dY4JQTExUxsDlnY+N/erjEEJ0aIJi+66jN1Z3xLOTFy lQyN7ZwqZeoPAqQhPwdLZsAurebpERn8lrKbwKpZfrIV6GUywLwmFTMXffgl1CQUlz hufERs1nSajfvLeWovN2ZT7MvmsRYLcvqoBuse4Tl9QtOfqjcNPx5mj3/+azOH50g4 /9bsdufZH69jA8HmpK9JAqx55sk1JqYm/pSFR7P6J0g0TclO/4xMJt/yoeTnTwJL2g lZFBNeR1q/7IWRMYOmtYiyFgX6yLuzq03ObljnkswzLbPpQUaguQ6x193dXt0g7I3G JuRCtMajxGpqw== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T6JCJ5yhcz4wnv; Sat, 6 Jan 2024 09:33:48 +1100 (AEDT) Date: Sat, 6 Jan 2024 09:33:47 +1100 From: Stephen Rothwell To: Chuck Lever Cc: Jeff Layton , Jeffrey Layton , Linux Kernel Mailing List , Linux Next Mailing List , NeilBrown Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree Message-ID: <20240106093347.15810e18@canb.auug.org.au> In-Reply-To: References: <20240105110007.3f932561@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_/MmCxwecSmrAxXalQUn_hEhd"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/MmCxwecSmrAxXalQUn_hEhd Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Chuck, On Thu, 4 Jan 2024 22:51:07 -0500 Chuck Lever wrot= e: > > I plan to rebase nfsd-next as soon as 76d296a82657 ("nfsd: drop the > nfsd_put helper") is merged. I'll have a closer look at this > conflict tomorrow (my time). Instead of rebasing your tree just before the merge window, why not just merge nfsd-fixes into the nfsd tree? --=20 Cheers, Stephen Rothwell --Sig_/MmCxwecSmrAxXalQUn_hEhd Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWYg8sACgkQAVBC80lX 0GxJcAf/ZHPehlLspMqSMbDDHS5utWs2Myw33qiBeO9fpibNe/r6f6cRE77pjTqM vcO9cDtniiIngaeK4YSGhBCCQaM5N+/XgTENGd3NLMp+0/kyhJERH5FpGIKhCyLB kHIir0OGWmSRsrG5sH9F+Vpwce456kSVsolqgy45nrw4ok6w0sERz5uOvMC5oMck tEYKqGkwgkKU1bFV68NoG9zSkq9p/plcE95xLy3/y1baGq2jRjgxggypCRozrN4R y7Ov5PPAArTXqWqmitO0A/Jv2sliVvr0I6xdHeYtyb6mbzDJz88xRZPbxSSy8hUv qHdVt567wWmo/80QzpTOnHVzdSpkig== =5bt7 -----END PGP SIGNATURE----- --Sig_/MmCxwecSmrAxXalQUn_hEhd--