Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the nfsd tree
Thread-Topic: linux-next: duplicate patch in the nfsd tree
Thread-Index: AQHZJtuHjKaXgt/yjkWRrCUo/8ISo66bbLAAgAW0fICAAK0OAIAA5AyA
Date:   Tue, 17 Jan 2023 14:28:42 +0000
Message-ID: <C72F2CC7-EB89-44D4-AC4A-C33EBED4B120@oracle.com>
References: <20230113101326.09b1250e@canb.auug.org.au>
 <53DEC27F-0AAC-4EFA-AB6E-0B5D44AACFB9@oracle.com>
 <F7CFC18D-6AAC-4DAD-AA43-5C718FC1100E@oracle.com>
 <20230117115228.13b55d07@canb.auug.org.au>
In-Reply-To: <20230117115228.13b55d07@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?SX4Fo2a76K/TcjqPgFmjLjSNVOKZ5dGPEUNg6EJ/+Ur2eMsCzW7L4BuI8Zat?=
 =?us-ascii?Q?IOTFGyfWFbs78YPgjW1v43vQU7oMZruqMjgoOXE3a3m36YJj0P1v4ezKmGL2?=
 =?us-ascii?Q?hp4/zyvSTFiJiocBlzKeJ+8u1GKJIEIT84Pq6mTrhf30WNISzWNGUQOmf/B8?=
 =?us-ascii?Q?Vqb9r5+x83beYtUBKYeR4aQLSJ0AMMpOBYz0nVO62onBhYOAaE7GXpBnbEu+?=
 =?us-ascii?Q?DvXroRzCXQWc4dMWQBln8nn9TXepEJ0WqDpsrH5ZNW0iTqgTbyaKRS+uLR+K?=
 =?us-ascii?Q?YeZyjmXhR9ttb3RrrqpliVCb4ZvnTp47VUBnP582FKWSI0d83kUIcil1o2DP?=
 =?us-ascii?Q?hUSSBKhsCnQXZ/0C5jW/OFIijv54CaraCUrsu00CRnR89pNgM90QMkEJ9vvA?=
 =?us-ascii?Q?MHwD8zndVcPsGYiukpA/LP9BWMgIg6V7Hf1NZL8PKwrY/CWlt9w44chmCn7P?=
 =?us-ascii?Q?rvtcfvpUx+qf/FIixZBBsW1AxGs79V458PeKbu1b1QJWupN9Xi4Jn54khfi+?=
 =?us-ascii?Q?Xihkpwk01I2AoP1D2CNlaAEnycBPUamok1kcS0raXFPwsvB6AwlmCUelQiHM?=
 =?us-ascii?Q?kVfrx8wSnTpmZOiVZmFaC2/vBlG0zXbQg5TfJ9SIoRwbJpyS0mLMZfF53HNW?=
 =?us-ascii?Q?coUqJe05eruGtBqzmIUhPMfyt82GS/P4UHy/LjPlQk/Pk6m8C8i+CCumJBbO?=
 =?us-ascii?Q?3jPeNoLE2d9v177/Z0NAmjSA3MgsVwkq7XtEFVe/IFWl4B8VyFImXjo7vd/W?=
 =?us-ascii?Q?XwOsa6ruGTfX7xbxLWS3XSe4YGiYbGwAeNgenY7sNVKZlNqrRVQlu8zAOoTK?=
 =?us-ascii?Q?d71statz09OJJ3KjmV/wu8LdjfNzO6y90/beJgSsaBAoFqjgTTAHVQS55zO4?=
 =?us-ascii?Q?pi5JT3F/2uj+WCJQmpO9JGULrHo0LzCjLUnNQYZTC/NaS3ZVWsGre5Drtou+?=
 =?us-ascii?Q?yWlUgn6pqF8uPJ7TbPGs9YG8x0xi5MrF5Ix9OW9fIUK7twllBul65PZSOrQo?=
 =?us-ascii?Q?RkCDWV9KgYvB6BweEs86NL7xIgR9uQWZFiEXl16dEfhXIvDNTD7Awh+9fote?=
 =?us-ascii?Q?/R+YFngy2+YNlGF2HJD6vppZ1FJU8ijo6jW5FzkRjB24ZiFyCvJKiPyMo9Zi?=
 =?us-ascii?Q?83XKwda/wa5rAWz9FepisnZ+nG761S0AdR9HmpvpNUt5vRSKhNzQ7xIqsLF6?=
 =?us-ascii?Q?L0ubEz4TtoCqa7Vge/Ocy7+EmeiN20KCLHvrCs8jMXoakSw/wAoLmxHcOkfR?=
 =?us-ascii?Q?2dDfw6+fwPy0TAY+LXDXSUB+jjP3H/G19ejlrFT1pLJ7dB4oi7XgWEzYgciS?=
 =?us-ascii?Q?+HVNavcvAVZOO/uHzKJE/Vu2oftZ5WobXpNp36DAkyz2LZEeChdlJKvLxy0a?=
 =?us-ascii?Q?CyO9MaSMtgXzVDeFstEK+a+RkTwPsM2mrU7XNZ+cUXJv9buw9Dr5XIOYbUXy?=
 =?us-ascii?Q?+TLExnrvhiYyCxHOT5eZVBwCvQXwFsMkLglmxxzhCILAcxzoKHjGQ4jWXacG?=
 =?us-ascii?Q?mfPSNuorIo2PxiT5aiuAnxdpAJ0U0AUWySpN2qUe5ovLlCE0LePiGeKEoQIN?=
 =?us-ascii?Q?JUnthT+ZfikxP5ZF8FX9DEoxQJ+6GYwEuK2NaWBzU0NHSFTfVGLq2LwJ6wa9?=
 =?us-ascii?Q?wg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <6F43FC67DBFD6F4ABCE7B6282AB06B39@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: P0aRTDA0T2I6bA12pyem6kqLXOXlvpbxr3528nwQO3Rk6AvQbtsQMBwdXT+IPx0JeDGWqEKYT/ndWcXTUZQHczAecipmIKidn8ylZKPMO91aC4zOGzeE2Easxqc6NYdHzE5+d99WRHHkonBiyI2TVbEI/BLDXxDq9i6I1Qs+kUXMNJh78Xv9WZcN+eGlYC80JD6BBUXZa6dPsCfgIsrznEV5/DuC2WcIWZOWl/hoNc7ogzOV3OTxiSB0qbDl2S6rKlC/kuPBhvy41ymhKPTPF/ydXfChEAiHzZbU5MUiVFds2Bxf8ab9Y5kq4OEUuFXQod4N/2XlbH75EF/F/3RYRn3OLCF+ytnw9zbzuc6zV3zqDzrGMM1/8iXodDFCfz1usHmrBQhDsjeBrwwHJG8ItmooU9mhvYs0dJNbJaRmN8FHG0+stChp3rEuIq6OvLgH94YD1d+KxiN0YykBic/895hdrG/CEWmSuTx5FpAojzD1nT7OnjIx3z8Q/Fp2WfBEqrrx81U/cvm7enYdvn6/mN5LYaRyR7pCQyeAGzTMgJjUwn/I6qOiO74Le9cl1VrTMqTW1eTo5IUFfLVO3XoQxISNyLTnQXxbimcO3VL3ahArxpWrZ/Dj4VSCRFz7v5NpQVxevWbCqsHktWHVbnchVMv8mZhMqiXTefw2+GuFViwHQAVWGxQfSKbDRRMc7JrJaAyAasS4X71D8qKiVfYOY5KwpyN2P8PuVtAm68aFO0VYiA2RlWMms5wwvUxFJ7Oij2AZ9qazd+EguSJc7Luu9PF9ztk2XFhAJnAJhHl+4RmWej7XgJ8GM3D9LBB9WCyn
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8de61055-2f39-4b96-44a1-08daf8972207
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 14:28:42.0685
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: gbhGzRUFqOuhImRuTnxLyHCiyxVALaPB2C5PrGiTc5OT7NKjtvT9VPCFs3ButlGgYI8xxRU6o+0ylawdnbif/A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5872
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-17_06,2023-01-17_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 mlxlogscore=999
 suspectscore=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301170118
X-Proofpoint-ORIG-GUID: 1o6zI8Gdeh9SnvppFyTvaNtrotjCXp2h
X-Proofpoint-GUID: 1o6zI8Gdeh9SnvppFyTvaNtrotjCXp2h
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Jan 16, 2023, at 7:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrot=
e:
>=20
> Hi Chuck,
>=20
> On Mon, 16 Jan 2023 14:33:06 +0000 Chuck Lever III <chuck.lever@oracle.co=
m> wrote:
>>=20
>> Sorry, I wasn't clear. I need nfsd's for-rc to be picked
>> up and merged into linux-next before I send a PR.
>>=20
>> I've trimmed for-next to temporarily remove the duplicate
>> commit, so you should now be able to continue merging both
>> into linux-next without an issue.
>=20
> I am not sure what you mean.  Your for-rc branch has been in linux-next
> for a long time and the current version (SHA 7c24fa225081) was merged
> last Friday.

My bad. I was looking in the wrong place.


> For clarity, the cel-fixes tree and the nfsd tree are both branches of
> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux - the for-rc
> and for-next branches respectively.
>=20
> Maybe I should rename cel-fixes to be nfsd-fixes?

Renaming my source branch as well would make things a little more clear.

How about I name the branches in my repo nfsd-next and nfsd-fixes?


--
Chuck Lever