Received: by 2002:a05:7412:98c1:b0:fa:551:50a7 with SMTP id kc1csp463822rdb; Fri, 5 Jan 2024 16:45:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IGR5IfbUwCKONBWTkPVsiyWO4a0ndsniN8K/QMgxOL2fnSLiUqFBMWja1J7oKi8vTizsitY X-Received: by 2002:a5d:6644:0:b0:336:8b43:acac with SMTP id f4-20020a5d6644000000b003368b43acacmr93741wrw.13.1704501947373; Fri, 05 Jan 2024 16:45:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704501947; cv=none; d=google.com; s=arc-20160816; b=ZcLBTd3gwH11fTkdnR6Z++vIP/RU2kc4IaaS1YdJJ71Erd5r356MAsl/2fxr708j4h SQjzGEijPgD9pwD50nSerkNfnxYJM1UcOcNUSesi4M+SPXWyOsIB8YswwV4HsYE6dPMO YYBeDMPDSkGxA90rPEptNIYywreh5EVcV1UK89+Rjx+dnDupjXKXf2TbHlWeBU9ew0oX +LkUIifI0MCgyFJC7hfrR+0c5aUNQylAMIDmwdeySJclGvMIJ6jkLrO1GMor2TzdYRBL s/SGdkd0i6EZEPAZU6b7HJ969I2cJSYn+n9gHKUgqUMKZ0qwcTd9pO0plt6nIxt0JPP0 qR6A== 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=a9TqJf/J+DEHEPK//TAyFEgZIVh9BJi526NaHHRYabM=; fh=XPLPZUiAL5rcX0TG4tAMIsRUph5VyExN1WDB+uldaRY=; b=rlJW+B6bDkB0gl3oKPPihoQy3E7H5vOx22ewzhZXkxkf4uxkPkFAAVYYwxUNWsimJ0 RL6Af/kcomoRUVbNo/mqU7JtTUzrwDQdazo6m/e8++8GRLbFOxqs/4Slh0wOb+sFng6Y GBH1q5hdp3DT0wdlOjJk+c5PmncxMYnsnM0uHq8eYtEm7TLf/eZ+sqMCb52iui+JjgoG WbuqDbQTrWac6bdJPZYyaqksB+CSuxkq4CoewDGbBlyGaiWaNc24cBxBcrdywdrjEMU2 /5VCXca0n7yVDMvBCD9ZLXqatenzOS70PWWwptuDy81GOYflYFRZQ2KB1uGJ4ogtucGs c0Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BHfl8XWB; spf=pass (google.com: domain of linux-kernel+bounces-18437-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18437-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 am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e12-20020a50d4cc000000b00554e7f46b09si1044719edj.520.2024.01.05.16.45.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 16:45:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18437-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BHfl8XWB; spf=pass (google.com: domain of linux-kernel+bounces-18437-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18437-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 1BFC91F23F94 for ; Sat, 6 Jan 2024 00:45:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 50A17139C; Sat, 6 Jan 2024 00:45:38 +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="BHfl8XWB" 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 79A8210E6; Sat, 6 Jan 2024 00:45:32 +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=1704501925; bh=a9TqJf/J+DEHEPK//TAyFEgZIVh9BJi526NaHHRYabM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BHfl8XWBjKf2RsVYJP9D7cr/+R8pHUL7er+2gP+Ftu0o8Pz3KXhSlShw8PQv1LUkU LuQuBPFrSVFzAk81vnXzwCB11Rfd82YbBC/eLJvVIuNOcipq+SrKbMZI9tnX+5PGws SdLFkMDAAjPtjR1AOQWCNNtHLFYv/eNaPi8mliqIuVL0YKpM/4HfM/qi7cXl4DgLBM GIY0KDC6uzOYXo56vKIMKzSvFZeB5Gu3HjMqM2pOhOTz6V/nSlZRm6OCXgPAyEYFHe P4ZOryb49Qzsd89NSgdDULwOOxS51VoYZ8xnJeS9KTI38KvoRCJzZ/onJKKCA0odZY /XWQD00PwoULg== 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 4T6M781Fz0z4wp0; Sat, 6 Jan 2024 11:45:24 +1100 (AEDT) Date: Sat, 6 Jan 2024 11:45:22 +1100 From: Stephen Rothwell To: Chuck Lever III Cc: Jeff Layton , Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List , Neil Brown Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree Message-ID: <20240106114522.3c06e732@canb.auug.org.au> In-Reply-To: References: <20240105110007.3f932561@canb.auug.org.au> <20240106093347.15810e18@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_/iTCJE6SSS.=tr9PQ_AdJ+mC"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/iTCJE6SSS.=tr9PQ_AdJ+mC Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Chuck, On Sat, 6 Jan 2024 00:26:53 +0000 Chuck Lever III = wrote: > > My development toolchain is stgit, where rebasing is butt- > simple. >=20 > I'm not smart enough to make all that work out, and merges > make my head hurt. That's why I let you and Linus handle it, > and then never rebase once my PRs are merged into > torvalds/linux.git. >=20 > I'm open to learning more, but I might resist making my dev > workflow more complicated. Understood, but if you are interested, see Documentation/maintainer/rebasing-and-merging.rst --=20 Cheers, Stephen Rothwell --Sig_/iTCJE6SSS.=tr9PQ_AdJ+mC Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWYoqIACgkQAVBC80lX 0GwvMQf/St6eZBUic0eORurt4uyq67/AyvbH27ZrmJ5JLW3lEANaRaluVacugTa6 OFCXLj2atWqDp4twGm/vtlxJnhzz1mdlkPB2htqVYew0yRXu7x5KDNByVf1UEfmE H8w4mlBfcWpiwpoUhOa2K/x0At7WJF8MQeZ/DxgWKlulOZcA3CnnIfLhYPtwXCdO iZE4TA9IzgB/n6TxBjobu1fPODpqu0WLkSXjvQQiGZHxBbehb/+CGrBnCoTZWIi1 7mqmzggIbPgb7OhSVN68Lm932lMMtudB5aNyCgNsZhnv46BKIxXNRLFfVRhxgPhx JJ5gAqdCGEheon3gMFT8uMUhO1FbRQ== =PeA0 -----END PGP SIGNATURE----- --Sig_/iTCJE6SSS.=tr9PQ_AdJ+mC--