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/8ISo66bbLAAgAW0fICAAK0OAIAA5AyAgABtdoCAAAaBAA==
Date:   Tue, 17 Jan 2023 21:23:45 +0000
Message-ID: <E6550C77-4A13-4AD6-8991-D1E369F716E2@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>
 <C72F2CC7-EB89-44D4-AC4A-C33EBED4B120@oracle.com>
 <20230118080027.300ab7b5@canb.auug.org.au>
In-Reply-To: <20230118080027.300ab7b5@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?IjGn3gxithy2PbLchtoJqH/L9I2mr+Io969v9g99EF1YVFI0Mjsi5SYDa35x?=
 =?us-ascii?Q?z/mmXNe25d4R4tb5NBLNdZU/Ok4F2843nCMRbTkzAkLnNRC4zmf/zyiPpv4s?=
 =?us-ascii?Q?URC95FvuidZ6GJsIgB7WVxv0zq8RkmqpnDfUPCB9IhQeYSTn0q2+mZd0xVv1?=
 =?us-ascii?Q?dILIHuDcRY3yIrw75lYkiFkDEr4vE1RhQbggBMr4/cTdRZTtoUhKRFmaZYpA?=
 =?us-ascii?Q?5mxpSFoFLNTdMq1xZvDHbc8dPMCh6V0GnDlHsIb7KTk6q+ot/Pi9w0+Gy5O5?=
 =?us-ascii?Q?TqC8ENzwac+fo0SNYEsrNnAlih6VKuBs6qVZtEX+/wwW33GHYPzxlAfZS1no?=
 =?us-ascii?Q?mOIzSKQndHA6WFVJZHz22zjBYmVTkd9yy4NDsIYx0IRuBQIBo0UKwL2yTjmP?=
 =?us-ascii?Q?jG6D2geLaOZPCZKNOGZeGcSkCmKBhfrtiSAG4xUS0OlcRYSTFGtCq6xpsBvw?=
 =?us-ascii?Q?g33Fou0OON/rrgZN291ua4qSQphEUnD9kSeorREZ36dQIMIR/3XjFEWy5xp+?=
 =?us-ascii?Q?2IzvceVaAsX6vAOWM10kFP7pYz1OTdhoXOVcXqxP2BUbP3CsdlkxEXUwfF27?=
 =?us-ascii?Q?i72wO03X61R8XzEhPHZDE/i0T71jyK60Fc2Sodkg8ZUkq367a8bd7J/Yw2wW?=
 =?us-ascii?Q?2jHIVVm/BIvKhoSihd7Tm1jaF41jlHjW13oTpZZ3HXvmpPRz8x64+aNUL1Q8?=
 =?us-ascii?Q?bA3dgmD7svlz2fcDZLVoC6v0KxaaPlDCXaE2ji6CFswuPL7C4BVc0Zzkvyeg?=
 =?us-ascii?Q?jXnXzJjrGMcarBGoaoX6sb5Imvfc/MuLi4EOqgGKHs2ffHnU6570rJmsqndn?=
 =?us-ascii?Q?qzdJEoXC99xeUsFuOv6yrLLw0F4Q91BlalKrUZSWa8SKM1qoHK3S3SnjdjfU?=
 =?us-ascii?Q?EheVFRxFDLGCkwxwZzoWO5dWmnB89B7a5ZlkUE5PeUB4xeVDf9GYmLUxVkUD?=
 =?us-ascii?Q?sEO6CDRNXzCx8vPjVlnSCXTBSS/qDzcGWJYRkrGqn6FbdNwMtU+h4nf+Q1zy?=
 =?us-ascii?Q?Pp2NVAhZ5XMEg/m1iA6NWvUfU5MNDKNHp4q6h+iRyWlf1kms9NnBsSVc6FKZ?=
 =?us-ascii?Q?QIvOwFzYWCmJG9AVxW5mWQJRnNvRb6GBtIuGh07M1t1ChwanfeL9ypeDw7fv?=
 =?us-ascii?Q?uaRwLWuo7cJVo+ocEcTqlADmPnjyjCBWlxGKQuYblX6IEdK4BSUkSdqhKS32?=
 =?us-ascii?Q?WrpPSm2zSTnkOQp8nRrdASNI/lgY8IWj2Ybifwq1Drsj8gBV+ZYXBJ6H9wKb?=
 =?us-ascii?Q?klwb1sBmM8C8cW9aXYdXRDzh/iWBQ5SjRWERQ3QLrYBUT8KqqeNmmcaTEFn/?=
 =?us-ascii?Q?GwLgxumReFCfv2nrjmN3kthLgpQa5D/r4kyq0D2DNJGZoLs1uJ4Da+2qKLKR?=
 =?us-ascii?Q?SL2Bf1lx8hkgf0uw0YlcRMyFU+hXaMTEDTFWywckjmgEomu4vyr5JF+q0lpu?=
 =?us-ascii?Q?desEgCeJNBJQGaVPKJRAJ2P2bhUQgtP+V5UXI6tK5WnqBZ/XGfzvGGor1w4W?=
 =?us-ascii?Q?8tnOIuk0L9ZggQdjqrbV8jzaIDxQUtXU/IrC8flgq3WuyXFqI4+aYfgw8KW5?=
 =?us-ascii?Q?tLt+iBrDV8fcENTJCQgR+XN2HT2f1TOHcOXjlO6SDk1okC+sAq/aX3fCYCtX?=
 =?us-ascii?Q?Aw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <ED472CADCF780E4C833C1B2BDB3E6134@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: FGgoAr/Eafpha8J/apsXuCUfr+rwCvzKYVIXReKTFM+h7Oc1UgKPlSDDcLLDbd5d/8UgH1SQYmBL2PigQOS4F6mIUjDCtN5JWoEIzNX5uHvKO9h97cmmGBBY83ee2yApDGOTnXt7KNG2ZBRJMHgPH9jPicLVNr+CSADHsl9/+KbjgJeLqRDE3cXCvnIXCTdK7eqSM4zoW8ZiLa+zRtT5cyWxFo9yC/gClgG6Et+G/xQuJFXm8i9TsIs0fFDm7lzv0jXLVNv1iGTd/rqnaWgJk8EaJe+rZFbWn/5n1BmT5ih2Bpwph00TD9jBnGSErjBWLfcujI9QL9ALhQmAGaDepmEmP+RvOpbSSPlsmjp+9nv39ywZl+0DNLEEI1EY3rlIeO5x2IqKJKQay/KshMUuxD5FLPSAkGeroCAL0L0ImFv8QjgkUbmGm5YeA4/o2XxnOpcpt47YGkZlbfvHZzTiQNIqBLTl2MpXk5h2OvIyT0JOcUoOWzZ4zBfXBc9Hbsk76oZNYkvx4a8hS4iOtGJlpsxxlpzxJsnHsLBS57VcWdnLTHaKGLP6kYqh5EdzBQ3DwkQ8RDyss71E+8BIxxvDxX6cAbJCQ+QFtudbXGAtibvGVMc6VIh0yu5YCQOtF/W+SvnOih3rPFAl6eO4Unu4vulI9NBdKvLz69hkljEMzwxI/y3VOE3MWP7ZEkaut6GQytNGAIK1ZP+LNiKNosxN+ROZlKMn5Jfqs+rVsbKVRZNXQGYycI1xtpAlhG7a9IwB0q+WuH2nN0viphWCAdlOwznoJZkdbI5h78W9WPY9gZm/QdyNCV69dNTvcM9HAfDX
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: 4a111ec9-f5b9-4e9d-ac62-08daf8d11d80
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 21:23:45.2859
 (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: JfpoWLNI5pPJCIu9jIuuzgCr3ls8HbBmQsgBtiCpqatdVSIPbRj++FI5Ovogq58zvh0kPNtymSt4y6rWtrTpKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6062
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_10,2023-01-17_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxscore=0
 adultscore=0 mlxlogscore=999 phishscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301170171
X-Proofpoint-ORIG-GUID: kvWPoxK77tVIbM2Pdf62_LqLkMyANdq0
X-Proofpoint-GUID: kvWPoxK77tVIbM2Pdf62_LqLkMyANdq0
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 17, 2023, at 4:00 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrot=
e:
>=20
> Hi Chuck,
>=20
> On Tue, 17 Jan 2023 14:28:42 +0000 Chuck Lever III <chuck.lever@oracle.co=
m> wrote:
>>=20
>>> On Jan 16, 2023, at 7:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wr=
ote:
>>>=20
>>> Hi Chuck,
>>>=20
>>> On Mon, 16 Jan 2023 14:33:06 +0000 Chuck Lever III <chuck.lever@oracle.=
com> wrote: =20
>>>>=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
>>>=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. =20
>>=20
>> My bad. I was looking in the wrong place.
>=20
> No worries.
>=20
>>> 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? =20
>>=20
>> Renaming my source branch as well would make things a little more clear.
>>=20
>> How about I name the branches in my repo nfsd-next and nfsd-fixes?
>=20
> Yes, that sounds good.  Let me know when you have done that and I will
> update my end.  In the mean time, I will rename the cel-fixes tree to
> nfsd-fixes.

That's now been done for-rc -> nfsd-fixes and for-next -> nfsd-next.

--
Chuck Lever