From nobody Thu Oct 7 14:26:22 2021 X-Original-To: dev-commits-src-branches@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 74CCA17E340A for ; Thu, 7 Oct 2021 14:26:32 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org [54.200.247.200]) (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 4HQDCX0ZTYz3Jk7 for ; Thu, 7 Oct 2021 14:26:31 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1633616785; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=bVmRL71ZhCfr/IZcXNMT3PMDjksZhSlQHu3fDUgZQmQqsxJYoOJstX0RaNJjVSpX3PLE8ut6vCikK n56QjByXc7bnDsvO2emR62Pw57gbF8w9YtoWUX1kW3p/4cJXnPZOVLPe51FoU31AQeeeak+60A19Hs qvHrzSFsRKctrRZ0M3aEARidKtbXdhZV/gK8UmJveyrRv+z+r5wnXsoO063H/4mNNz7cQ9B47a0nEF XYwIixHu44gv/vVKaXhdsSOe0mJSVCFK3HMziqwCtlm9i7bRGAcM0n+fZ4YTm9AVw4AL/+PMxip6ra cSfU50dc79zZAjCUbruoXWoev36He9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:dkim-signature:from; bh=6jGOxueyemrxrFWzJfT/kIjq9WTOo9s6Y8h+UlBf9Ds=; b=sI1z1kufNEFPzVgQ9+P7h1OaWNbUzCBKvR6DbsZ1sZvByugXdpbbEMthbyf+Ylc8UaiMOPvSQtvwT Js8zOgv+fj/m4urRfsM0fHXgKTyIMLl4b94WBsTeuy9fwkTExPN49RHmjtR3UHlbvT9B1NXDO6WRkC zuAQu6BaoUbwDETVxxdcY3zI/uC76S/0VTbKzUCVuxGKxxUMXQRuj4hHb8+XD/wmSMOCIGCPwlLOrL RonbyL7uzxYyBOPaA69Di2Kt5bYiLzeLWMgfC56G0FDGZIsky9VEiKlBRyFYYF7sc0dlgQwpW5A7Hs 2KzqLsVZpnqp6F5VldkDibUMOWc92Tw== ARC-Authentication-Results: i=1; outbound3.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=24.8.225.114; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:from; bh=6jGOxueyemrxrFWzJfT/kIjq9WTOo9s6Y8h+UlBf9Ds=; b=MPtbm/jJNa+JL6y+2OLBfSI0QQGwNLNw21/TnitS8WqlrPXf0M5gfw2I06pJYb7i8qmMLCyrSbRK+ h4rlYN8Z5+gUjZ5eVKEOD4+TgRo7JzifCSrRK1mySqRjrZaS6Nw06s4IgE7sPwPsqWbDpVNG14+I05 yd/X8VbOTEW8VNgjxlMdMQdp6wR6Cf3vDFHsIplVntbiGMmjVvquzPryefQ5lAm75Rv2stxz48wAE1 7V4BOJ3rCtaTJraO6gk/gLjq8YBF2kXcGyWpyxt68Pi0Z01qN3XOG8VdA+Ie2VKMkbCAdWDGfgdZU6 jpk/MvFLkgI1s88aV8+GoScysZ2yjIw== X-Originating-IP: 24.8.225.114 X-MHO-RoutePath: aGlwcGll X-MHO-User: 8c230c9b-277a-11ec-9ab5-bf9d68d023b6 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-24-8-225-114.hsd1.co.comcast.net [24.8.225.114]) by outbound3.ore.mailhop.org (Halon) with ESMTPSA id 8c230c9b-277a-11ec-9ab5-bf9d68d023b6; Thu, 07 Oct 2021 14:26:24 +0000 (UTC) Received: from [172.22.42.84] (rev2.hippie.lan [172.22.42.84]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 197EQMqI020221; Thu, 7 Oct 2021 08:26:22 -0600 (MDT) (envelope-from ian@freebsd.org) X-Authentication-Warning: paranoia.hippie.lan: Host rev2.hippie.lan [172.22.42.84] claimed to be [172.22.42.84] Message-ID: <2898a7a27162e1ba0cd0d93b99b0975f8ad65ff5.camel@freebsd.org> Subject: Re: git: 000aad3d093a - stable/12 - loader: allocate properly aligned buffer for network packet From: Ian Lepore To: Alexey Dokuchaev , Kyle Evans Cc: src-committers , "" , dev-commits-src-branches@freebsd.org Date: Thu, 07 Oct 2021 08:26:22 -0600 In-Reply-To: References: <202110070337.1973bgRH073900@gitrepo.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.40.3 FreeBSD GNOME Team List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4HQDCX0ZTYz3Jk7 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Thu, 2021-10-07 at 06:50 +0000, Alexey Dokuchaev wrote: > On Thu, Oct 07, 2021 at 01:20:05AM -0500, Kyle Evans wrote: > > On Thu, Oct 7, 2021 at 1:06 AM Alexey Dokuchaev wrote: > > > On Thu, Oct 07, 2021 at 03:37:42AM +0000, Kyle Evans wrote: > > > > commit 000aad3d093a376bb1104a284b4102149db43155 > > > > > > > >  loader: allocate properly aligned buffer for network packet > > > > > > > >  Use memalign(4, size) to ensure we have properly aligned > > > > buffer. > > > > > > > >  (cherry picked from commit > > > > 659bf32dfc595b6cd6aeda7f05cb57872c64d2d1) > > > > > > I don't understand, so this is a merge of the commit from master > > > (main) to > > > stablle/12 which had then been reverted?  So why do the merge in > > > the first > > > place? > > > > Because commit + revert pairs are noise in the MFC tracker that > > distracts from actual candidates for merging. > > Sounds like MFC tracker should be fixed then, as now it is noise in > the tool (tracker) vs. noise in the branch.  Tools come and go, and > code stays forever. > > ./danfe I completely disagree, and used to do this kind of mfc even before the nifty mfc tracker came along. I see merging to older branches as a process of replaying the commits that happened on the main branch, and if that involves reverting and recommitting, I replay those too. -- Ian