From nobody Mon Sep 29 08:07:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cZv1W0CHqz695js; Mon, 29 Sep 2025 08:07:27 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZv1V6QxYz3FbS; Mon, 29 Sep 2025 08:07:26 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759133246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=44mVreuxDdwgW6jQPcQbEMxtxCg3vuZSss7qXdm3bfU=; b=GaR5ChgOhvHpHnyUcSikslOs6h0f9YHaUFXJF+t6uVNqqifI2vwMCMUrq8pxrIFwVueNrT qO0nP+lVS28fheR1lNG5QTbphl7lp/s0IvAS8YJDlX8QCaPr9faRjI2ab8BjiumxQAlvcF ASMiHxfGEi+K0gsFblt92QUVTLT9hkJtm4694syolUtFLHC5Tz2FVtnvrgbXwNQ4ljw02z JHXeSJEFzH6/sXNVJbRH9vUu+7izzn91/mIYozHol0Zp5ymUmNMFuLlSvoNfqjL0GgpZez 3CKLGC8jBUZ7iGyd3brLYVGj+7sigv8UsuGIWVrch3/44VZ7fpW0otR+jYJyew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759133246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=44mVreuxDdwgW6jQPcQbEMxtxCg3vuZSss7qXdm3bfU=; b=NP7BiX9+H3lwb83cqe24ksvmRtE9tDp0ffuE4/JD0DeKX1AdG6b6RqXHm+LsXG9cI9BV56 CE//8cAEL58Lk5kUaQepJZc47Wb7QPymxVdDH2ER2iK7fUAXYPnl6ibmKIlmkjRRn4M99j hAmn1vN+kEWMNapitfokCpM1pjzOT4H3zyeTmpId2hdvriqwHVaQJR3kQ7rWS0Tz0G2Cwz tTIQeOhVEh2ADwGoemItNEbLBSiJhZUr+ZTnsPT5TcGHUDNFwPh0AIUztKGe6G0adIGYRn cBWS7f9YKHKxE3HTthrqt8MNV6udXf/C/+KxFU0+wxHtXS6DgUdOKoqNJiTnbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759133246; a=rsa-sha256; cv=none; b=ZL6bfYuSIYF26u1dqbMKgsPRGUzDVkR1YkUBQOzG9igyaBupEZaT5E1XlwH9Rb+jUjF62m 5qxXX6JELcxf/To/PCWqcl5jPc7cqsd/R38GDdVAMJXIXuvJENym9yecl+KJQUIYKz6O55 AYTr7oZAiOw15vfBLMFzKsgZnyfg2XuzxwvLn+l2+CMAK8B9zHvvM/sSRvZIaaAJd12ScN c6LSCDfdp1HWyaakmxD3cEkT0PT9d5WJoNY2m7+/Lx6uLDkxDUd/vgkhehltE8JKyu6NkU /RXn/J8bqd11RE3i+os/Y0cJuNVpUagwlDhhSqzi1CliuTv/CrQAWx5oy8dqrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cZv1S4k8bzxh; Mon, 29 Sep 2025 08:07:24 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol From: Zhenlei Huang In-Reply-To: <08b7ae7f-8799-4cb5-b5f7-de4cb9c828e8@FreeBSD.org> Date: Mon, 29 Sep 2025 16:07:18 +0800 Cc: Justin Hibbits , Michael Tuexen , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: <3BE3B2DB-4A7B-4C66-8CD7-DC7FF907CD82@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> <20250927143548.661e75f7@ralga.knownspace> <08b7ae7f-8799-4cb5-b5f7-de4cb9c828e8@FreeBSD.org> To: Andriy Gapon X-Mailer: Apple Mail (2.3696.120.41.1.10) > On Sep 29, 2025, at 12:59 PM, Andriy Gapon wrote: >=20 > On 29/09/2025 06:22, Zhenlei Huang wrote: >> I have ever encountered merge conflicts when doing MFC and it is = painful to resolve the conflicts multiple times when MFCing to older = branches. >=20 > I always enable Git rerere and (almost) never regret it. Nice git command ! >=20 > --=20 > Andriy Gapon Best regards, Zhenlei