From nobody Thu Oct 07 06:06:12 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 31C2517EF04D; Thu, 7 Oct 2021 06:06:12 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQ16D0q3Vz3MdT; Thu, 7 Oct 2021 06:06:12 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1633586772; 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: in-reply-to:in-reply-to:references:references; bh=djWmFPhpFfKAqKogkAoIypCaq4qM1a0Ct4vkZTGI9Ms=; b=koE1TmKBmVRduWqG01a1Gja/8PCnFr/B9YeNC3SaEaRDnxkbMngavAdu5Gybj4AJFs1P+l 2WGiDoMu2fI9SVvDivuG1Och/p0HRL1ygcQ1FLo9TAtCIGzOgRdwHYOQM1jYLZbgmAf/bN QnoGlo/Mm4ryezq35u/XihRMvCPMg8/VfOOdQeYrfQpuTIIV03MUCSpMHzd6ZUVraxHlT4 jFpjinHDR/tUNYWEoc35Uc9pB7uuU+A7YrK+tkJ+ON+m9aYU9cxnBizyNJoC3k8iFJRK6U o9ngq8KXI3RD9j1/spQbOexdq9NDTaPFWVMTCEVhrSLcp+PetE6i9oNQuPUs8w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 1575D15677; Thu, 7 Oct 2021 06:06:12 +0000 (UTC) Date: Thu, 7 Oct 2021 06:06:12 +0000 From: Alexey Dokuchaev To: Kyle Evans Cc: src-committers@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: References: <202110070337.1973bgRH073900@gitrepo.freebsd.org> 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202110070337.1973bgRH073900@gitrepo.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1633586772; 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: in-reply-to:in-reply-to:references:references; bh=djWmFPhpFfKAqKogkAoIypCaq4qM1a0Ct4vkZTGI9Ms=; b=MckKGEz5Su8Xr8SFN7u+hJmtX7gbiu2GA4m46Z3weYfGP6qfU+v3U0jSlOA1qH+MJKbn2y MNUrHiJLTYO334M1i8wEgFwUpScQOaeAghcLIC8k/QlD/Ljv2OWfuQp5NrXLVWlTPCdBSt WGUyTTrrEM1MEr65YuRxIXdkmXmPPOTh2kIL7+N6kkIR/9IPneYwoRthtH1d7EW7zlXEIQ dUdlBOzwiJExKWSURCkVEhnBHZrUGhS7U3LAn49RTXBUX2rBjx2gTOrzKFsHWGYDjC/Las QraMxYSuAsPN2V1FBQrfORa2LN4Pd/RgghTGHsxNoHJrpTOh2QxPjdeY9vxqeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1633586772; a=rsa-sha256; cv=none; b=SRJhZIKS4prnpe+pSrV8blnijlo8P3twtilbvSKSM/mcpb5dNl6i0nyEMRW9SDcQfWD8lY 1uawOgK9CsPre63mEyPgm25f32aqCh1b8XHfVUcHCRWcpFRZbVe9lYTDw8phdbIYaEMkzo Z+tPEzMZrgLJKBDt1oNbOUuFecNcxSWcurcuWRZgA/Ss3L+mIvbWZ5AalmyctStrEUT9Oj YilwCALr+R7O9Bk+g4iiFQOHNmL7vgSyaK4VQL1YVXuQWOgEU2uBLsxU5U8Ac7rtw8cG+w dX9ifzMm75EtGAq1TS5vaCWqMTYG5uXjSJ84/a3UCNVrNsVZO15/6L+uj6boMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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? ./danfe