From nobody Tue Apr 29 09:08:32 2025 X-Original-To: dev-commits-ports-main@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 4Zmvcg4gVzz5tkc4; Tue, 29 Apr 2025 09:08:35 +0000 (UTC) (envelope-from mat@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmvcg485dz4Fjf; Tue, 29 Apr 2025 09:08:35 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745917715; 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=/ONVFd5MOSunKM/poVJxNxOKHdSYS8K7kQJfHgePoaQ=; b=ST/yknDhmW38igDOaipiJFETqkvf/60iI7ZZzZpEszGVV2Gs7kD28S0P00awZKzXbzpcvh N1pM4Diroz3WTEtduXFMgsURysjeTeTyJ2wq7qvwyZHwU2KEJ5ERzaVhxE/0bFcLmn1mnU qCWHDV8METfGktQxH2rLF1K0k/dnaHJ2T9O2ZpQRwDQHqTaD5MCbbx7bFpe69ff5JHv47H yC4xPuqPNSF6cPCZX9gzH5KJsOfMystb2NJXSUlY8S/w/E0EmweuQITdhPtWbFI10/4Z7l ltjhe7PPtwVQKirkYSLoTQLhyK8G0+F2OmZhf2JdvrM8f0+UZjYB5/BiScErrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745917715; a=rsa-sha256; cv=none; b=Z5th18G4cL9jO8+ZsX67KbRl7EmcDzRIUpynP+B51riYhhXijM2HbAsfd8Ft2XjFUwqUw6 2LdAKRBeKJjobSvSNVgDIOZGj6NP5hOrK3+qcj6upInuMaZIvwnrRdKEPAAcNm44VzUk3u tRhP5O31p4LZZCsGhp3KWFhG3S8NJ1DMxgp4jacpQjx8T8eDNuKkuZnZlGi1Fy1V3I5SHa STC3MN2JL1OPL0wa1kyPaYpXuuqLaHQoBViM7XVt9DeoEQvsEd601bNwWdMYC39ZYKh/6O z4hA88YDJkNd97EeC0ZGjGJygZWKWA7FX2rHlE2MGQ32NnjgfwNjEJzlzft7Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745917715; 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=/ONVFd5MOSunKM/poVJxNxOKHdSYS8K7kQJfHgePoaQ=; b=kzWWJCgv8GTotieoki0B/vXO7TvDZnB4bRzyg5mGyghooOmWkvyoVUeXUx29knOhCqFowr QCpigglir+j9cN1qzte7LiK2zpHfOaBpHF6Qm6WgtTI8se6LZgxwDBJMsyTcqgZCjVLI1L aY+tHjou4eZCs85icAmnno8AKsA60ffSvEaPQUNFa4f6XrusSlPC3bpcQ9pwxXDVFvmxoc emzO9ii61aZafjq7iY0wGJtgDyRfeoq9J28pvjyrOFnOyNiryJyWlbV3A4Pynxx7oD2NRB ePIwI8YunfmU5hEJGmqWF+ePENPs02nCjFgqZCjmUSDV432eEjgOK2JnBPa4Ng== Received: from relay.mat.cc (cow.mat.cc [79.143.244.49]) (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 "cow.mat.cc", Issuer "R11" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Zmvcg2pS7zGf5; Tue, 29 Apr 2025 09:08:35 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mat-Laptop-13-AMD-Ryzen-7040Series (unknown [IPv6:2a01:e0a:836:f670:57de:592d:5d13:7299]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by relay.mat.cc (Postfix) with ESMTPSA id C479720A15; Tue, 29 Apr 2025 11:08:33 +0200 (CEST) Date: Tue, 29 Apr 2025 11:08:32 +0200 From: Mathieu Arnold To: Gleb Popov Cc: Alexey Dokuchaev , Cy Schubert , Vladimir Druzenko , Cy Schubert , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: a8b4678fc925 - main - emulators/virtualbox-ose-70: Fix 15-CURRENT kmod build Message-ID: References: <202504282032.53SKWSwG044334@gitrepo.freebsd.org> <75d70616-d0ad-4c29-818d-25a21ba0042d@freebsd.org> <20250428162831.11f887a8@slippy> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nfrhnjo6zfvdo2za" Content-Disposition: inline In-Reply-To: --nfrhnjo6zfvdo2za Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 29, 2025 at 07:46:16AM +0300, Gleb Popov wrote: > On Tue, Apr 29, 2025 at 7:43=E2=80=AFAM Alexey Dokuchaev wrote: > > > > Seeing those context lines gone should've ring a bell that you're prepa= ring > > your patches in a different and perhaps unconventional way. We typical= ly > > regenerate patches with "make makepatch" which takes are of proper head= ers, > > timestamps, and context quoting. Try it next time, it is awesome! :-) >=20 > make makepatch also regenerates irrelevant hunks if offsets get changed. >=20 > If one wants to commit only the relevant changes, the way to go is > "git restore -p" to first drop irrelevant ones. Offset being changed is absolutely part of a patch and must be committed, when the offset are wrong, patch stops using an algorithm and enters heuristics territory, which may work (what patch calls fuzz), but can also explode mid flight. You always have to commit the complete new patch. --=20 Mathieu Arnold --nfrhnjo6zfvdo2za Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmgQlw9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb7TxQv/QOHU18ndsr7gHBnlrXk6hPAiuaZ7XEg/kbWyk9Cu2UZzYGBbaO2FPfh4 DcuvSriC7N8UTxPmfRFy8RJLC2kRUfNnQK6Oz7iMUl+tnQHT3hetFCkLPpyLq0f3 3aqKIXeuEdgiCCXrIH/bpFYv3LyoYiWZgcveIb8e5LWrgBngNjgQzMWE4+jx5czv FT+ZDU1Sctig/f0P2He6KFuMETe6Qb/k7xsEO72rA74lzgcSjZnd369bpLABLlw5 YlUb5ZL31NTwexRrXIEyRQASnhbxsSlOQg57uCXRuS+3YpfGL3gDPnz9QN/gOkAW FFSg3JY05vHxj6PFZsoeqwOiiYjuj1NoAw+n8oxJdl/5Kk/etRSqn30EXtrX49wr QRBpQbjknogb8Jgy6k6eDkuTfogXBLPlu8cp5oJWBToZ99NDAa0/BgWe33AQyDO8 VTqM1UVb+gDVKoeg1VV1I7eyrcSALMNzKdJVFGrwplOPdSFE+i9jM3zkyJICI8pZ 0Ggwv9e+ =E9V9 -----END PGP SIGNATURE----- --nfrhnjo6zfvdo2za--