Date: Thu, 07 Oct 2021 08:26:22 -0600 From: Ian Lepore <ian@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org>, Kyle Evans <kevans@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-branches@freebsd.org Subject: Re: git: 000aad3d093a - stable/12 - loader: allocate properly aligned buffer for network packet Message-ID: <2898a7a27162e1ba0cd0d93b99b0975f8ad65ff5.camel@freebsd.org> In-Reply-To: <YV6Yrede5/x5NM7E@FreeBSD.org> References: <202110070337.1973bgRH073900@gitrepo.freebsd.org> <YV6OVKE6dNy%2BkigE@FreeBSD.org> <CACNAnaFqymg6QQa1ATd0dyreXBa0-u-5Hb=kjjs2igjASFRwEw@mail.gmail.com> <YV6Yrede5/x5NM7E@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2898a7a27162e1ba0cd0d93b99b0975f8ad65ff5.camel>