From nobody Thu Oct 07 06:20:05 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 0166412B898B;
	Thu,  7 Oct 2021 06:20:17 +0000 (UTC)
	(envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4])
	(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 "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4HQ1QS6Y2hz3Nnk;
	Thu,  7 Oct 2021 06:20:16 +0000 (UTC)
	(envelope-from kevans@freebsd.org)
Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
	(Authenticated sender: kevans)
	by smtp.freebsd.org (Postfix) with ESMTPSA id BB333244E6;
	Thu,  7 Oct 2021 06:20:16 +0000 (UTC)
	(envelope-from kevans@freebsd.org)
Received: by mail-qt1-f169.google.com with SMTP id r1so5127012qta.12;
        Wed, 06 Oct 2021 23:20:16 -0700 (PDT)
X-Gm-Message-State: AOAM533qJfT4sdAR8XPJ6WTdnB6dD+J7SpH7QpCocEw60ZP1seKMRqlc
	YxjYs79FXp704LJvepWSdbvKN20jHhQyrJu4pTs=
X-Google-Smtp-Source: ABdhPJylCrMuDpE6MwTuVQwXktJJYkNW8MN80J9gRcFDeWXNh+47xeOC5wgVnB9Ka2kF1z0ClbEoohUa7E9Ly4Gci9I=
X-Received: by 2002:ac8:490f:: with SMTP id e15mr2867181qtq.132.1633587616224;
 Wed, 06 Oct 2021 23:20:16 -0700 (PDT)
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
References: <202110070337.1973bgRH073900@gitrepo.freebsd.org> <YV6OVKE6dNy+kigE@FreeBSD.org>
In-Reply-To: <YV6OVKE6dNy+kigE@FreeBSD.org>
From: Kyle Evans <kevans@freebsd.org>
Date: Thu, 7 Oct 2021 01:20:05 -0500
X-Gmail-Original-Message-ID: <CACNAnaFqymg6QQa1ATd0dyreXBa0-u-5Hb=kjjs2igjASFRwEw@mail.gmail.com>
Message-ID: <CACNAnaFqymg6QQa1ATd0dyreXBa0-u-5Hb=kjjs2igjASFRwEw@mail.gmail.com>
Subject: Re: git: 000aad3d093a - stable/12 - loader: allocate properly aligned
 buffer for network packet
To: Alexey Dokuchaev <danfe@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
Content-Type: text/plain; charset="UTF-8"
X-ThisMailContainsUnwantedMimeParts: N

On Thu, Oct 7, 2021 at 1:06 AM Alexey Dokuchaev <danfe@freebsd.org> 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. The only feature of svn
I miss is --record-only merge.

Thanks,

Kyle Evans