From nobody Sun Oct 16 16:12:40 2022 X-Original-To: freebsd-net@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 4Mr4sd482Tz4fXYc for ; Sun, 16 Oct 2022 16:12:53 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mr4sb6cpfz3gs6; Sun, 16 Oct 2022 16:12:51 +0000 (UTC) (envelope-from hps@selasky.org) Received: from [10.36.2.155] (unknown [178.232.223.95]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id F234B260A12; Sun, 16 Oct 2022 18:12:43 +0200 (CEST) Message-ID: Date: Sun, 16 Oct 2022 18:12:40 +0200 List-Id: Networking and TCP/IP with FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-net List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-net@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: Help wanted with MFC 256820 Content-Language: en-US To: Koichiro Iwao , freebsd-net@freebsd.org References: <558b6dd1a98fdb81df0443202695172c@freebsd.org> From: Hans Petter Selasky In-Reply-To: <558b6dd1a98fdb81df0443202695172c@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Mr4sb6cpfz3gs6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 88.99.82.50 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_SHORT(-0.97)[-0.970]; NEURAL_HAM_LONG(-0.82)[-0.820]; NEURAL_HAM_MEDIUM(-0.80)[-0.798]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; MLMMJ_DEST(0.00)[freebsd-net@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DMARC_NA(0.00)[selasky.org]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 10/16/22 18:07, Koichiro Iwao wrote: > Hi, > > I only have ports commit bit. I would like to ship this 1-year-old commit > to each stable branch (at least stable/13). I'm happy to help with > anything. > > I would like to try it if I'm permitted to do that with someone's approval. > I would appreciate it if someone let me know the procedure. > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256820 > > Thanks, Hi, I think you should do: git cherry-pick -x 9823a0c0acf4fc277a71336ea737e1de7c65742f Then: git commit --amend And remove the "MFC after" tag. Then push it to stable/13 . You maybe need to specify the override authors flag before pushing. --HPS