From nobody Tue Mar 5 22:46:02 2024 X-Original-To: freebsd-git@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 4Tq9dn4G3nz5DZfc for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4Tq9dn1zVyz53W1 for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709678765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=v5WRAmTG8t7XygLbH3mkBI5BKQNjMdcUtXl6b05u6vc=; b=SK4jSxqnmBNQu0VG+PZBP/wCAb+S4whCEHlSg64oUn7fTARuDn53Iil6DXZd8AN0QC8Frk eF/1radzz4VKXLYrO2RUYLwqhrrWeKEterPkubdCJpjpqNIGDVhR7JxZxFoHCrixJjAs0s MOWb06eyDWOVJJp5tKbYL7/QVBCSTw4Y2xBdqGCZooq2UheCyN1Xtz3tvu4bDxOrKISUSo 6pzT3jVgIz+hPAyyfTEQjZmgbn2r3YDPKO2i1VPPmMOlpDkAylkM3fgsUuonj0+JbSdsG/ bzYwfUSRBOATFEUuqLyzsWwblSJCeSprAZEUkXOb9KreWI32jLI21jOIdOP5KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709678765; a=rsa-sha256; cv=none; b=Nd4LNhkrwFuJCJBBDbOO9xxBbYDesE4gB9exdJLpO95RNjX/HDQ2rd5laLe3GEON6mwMMA mG/0hkAG18P1eDUqO17jC7SsuXDiw/DtUal0ML64E8IlbixqtoBpO7OlZStKGe+71B6bIG PwEcBJGEefh8rOqLHEHuiSHgjOP/jLv2L8AIAKErY0boMZ4jfoOTFMTEek4Fah4VKe6BOx FMF9MPPPFJW2Fd8znbVGR8MrIKskwWo5EaDd0YbweSXXX8EyvdrvwGZGHQH7Y5ujlk+2a/ t+aS9rtn+AwcQSmJ+zhMQqDfqkqZhJdq3F/P90dpVipmXVO1mAb4qbWtHBwOYA== 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=1709678765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=v5WRAmTG8t7XygLbH3mkBI5BKQNjMdcUtXl6b05u6vc=; b=betRIm4Y/moJs8njzVHygNayKrs8TQ0Nv5ROk82B9AVrHcvmY+0RQBoW8f/F4ZuJoMfoQu JKTwPVu5R0sk3VYUSm2YTpoN8VgZ8i32n+voh3pRcwLBge8GPxtyqOhOr20uoBYkNgJIHW QDlGlbDwYUTmCEkge3oHzQcuYRVeQC0a4cPZ1RqEkfS7vE0NTiJ3g8KoD6tCJ3g2AnBT7c gNnRFNC22Cij7y3J8AqJsV9gduBK28HMjEe6jzabyrXgoTz3984Rwr55sSMiGFZGbbmfgb i/DtoyuX77GB/J6KWDTJBBxoS8l3EowwheDMcChmzMSS8oXxObFRIsVW06jjJw== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tq9dn0rKYz1Hn6 for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id CAB428D4A214 for ; Tue, 5 Mar 2024 22:46:03 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 4396E2D029D8 for ; Tue, 5 Mar 2024 22:46:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id dLN6-ve5UnEx for ; Tue, 5 Mar 2024 22:46:02 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 673792D029D2 for ; Tue, 5 Mar 2024 22:46:02 +0000 (UTC) Date: Tue, 5 Mar 2024 22:46:02 +0000 (UTC) From: "Bjoern A. Zeeb" To: freebsd-git@freebsd.org Subject: vendor imports beyond the committers guide? Message-ID: X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII Hi, there's the edge case when we already have code in contrib which was previously directly committed and now should come out of a vendor branch. (1) how does one properly seed that case? (2) given I couldn't see that mentioned either anywhere, for local changes, they only live in main and stable/ but vendor doesn't have them so in case of conflict they'll show up with the merge from vendor to main and need to be resolved then? /bz -- Bjoern A. Zeeb r15:7 From nobody Tue Mar 5 23:23:34 2024 X-Original-To: freebsd-git@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 4TqBTH2Fr1z5DdYD for ; Tue, 5 Mar 2024 23:23:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqBTH09lKz56nS for ; Tue, 5 Mar 2024 23:23:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2d3fae963a8so6623551fa.1 for ; Tue, 05 Mar 2024 15:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709681025; x=1710285825; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Xx6UHTmpx5hW/DwC9Akj76wrq8i/DKewhKfyK4+ykVg=; b=ZeYjTqMuEgB4QShjg94YAlcxvfe0zTiVbtimcQ/E9aBwo51np35sZa8aW4Mhf50m+g 2o1i0go7lmpPYVtDU1nBCnkjmI3z8Mw8DadhME0HKNGXfCburTaLP+VtMzKNVMLqmOPQ 1mox2AqBXOkUJ4WYkjo+zU7qfIWyNllMTyhH6XP0LQz9Pb1BiUscLucDbTNkfmZmwrXz zwCpwU/0c9cBOFDoBgJjB0gdYiLHAtttwAb7HJL6uTBoOlHwCzt6iaCe3+srtwy0CRKT V9r9lWtoT6mEKK2c6RaBMJQn5ps844+7+a9YK6MojlelrRouk2g2rwN8eHjlmUiFCP8w wMFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709681025; x=1710285825; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xx6UHTmpx5hW/DwC9Akj76wrq8i/DKewhKfyK4+ykVg=; b=Ol4hzEcF8x/jKCMFg7RicZ9Xyce8eJiMNJyq8ZYZ9ijR4wEyPWcIrplL00EqSC9pDM hT3vOx+/dVCSLRg4O9zHJbopUAzyMuVEjPqoapJOHKQI7kRJpDbEbwCrMJKsGfwW+/Ox CK0j+gRkmgfU+O2+op80LyvSIWLkhKYZO2QmA2f9GkV/CSBXh7lZpTeRUoie6QyJ0pV0 QS16wimWTPyiOBWjvc+m0MKngL+rSRzsgFGKAyk6lWc19glqmi+WtQ7FN3RBt2iEkicx XM+3/kDchXk94abaHSbb9wNpii9AMlEsc/JIVu8fljGVMwJnALHAtJuLcJJFSanrrVdw yguA== X-Gm-Message-State: AOJu0YwVIpBSTEQTmidccThOyrtXTjkzDso5mTLxUT+Cm9eoZYnZiLJn QQqwk4SqgnT+/woJ8UkMUIInjeIZ6LtpKF1ATocDYKhmR2CW3dPdpMab2eof3/Nb2TGCDG0mMjS XuegjkzbT00u/XKpSfF9CMhCOM74SfLR/M4MV/4Jr23RAetOJQek= X-Google-Smtp-Source: AGHT+IE7In8P1TjPNdHO/AennCY3zqL9wDyWMufrKUomkxf/ZsBH3LcOUZednvDZZtyFFOK7WDY0TzZDabwJM0YHV4A= X-Received: by 2002:a19:915d:0:b0:513:2b36:3195 with SMTP id y29-20020a19915d000000b005132b363195mr1943218lfj.51.1709681024897; Tue, 05 Mar 2024 15:23:44 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 5 Mar 2024 15:23:34 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002b40120612f222a5" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TqBTH09lKz56nS --0000000000002b40120612f222a5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Mar 5, 2024 at 2:46=E2=80=AFPM Bjoern A. Zeeb wrot= e: > Hi, > > there's the edge case when we already have code in contrib which was > previously directly committed and now should come out of a vendor > branch. > > (1) how does one properly seed that case? > Was it direct committed to contrib? Or somewhere else? If you are moving it to contrib, just follow the process in the handbook + delete the old code in the same commit as you merge the vendor branch in (so the old history will be available more often)... If it was direct committed to contrib, then it's a vendor import + subtree merge + maybe fixups for FreeBSD. Vendor merges are just a convenience so that future vendor events are constrained... These details likely need to be documented, but what's the details here tha= t you need to do? > (2) given I couldn't see that mentioned either anywhere, for local > changes, they only live in main and stable/ but vendor doesn't have them > so in case of conflict they'll show up with the merge from vendor to > main and need to be resolved then? > stable branches don't care about vendor branches (except in some rare cares that almost certainly won't pop up here). You are just merging changes in main, via cherry-picking, into stable. Warner --0000000000002b40120612f222a5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Mar 5, 2024 at 2:46=E2=80=AFP= M Bjoern A. Zeeb <bz@freebsd.org&g= t; wrote:
Hi,
there's the edge case when we already have code in contrib which was previously directly committed and now should come out of a vendor
branch.

(1) how does one properly seed that case?

Was it direct committed=C2=A0to contrib? Or somewhere else? If you are m= oving it
to contrib, just follow the process in the handbook=C2= =A0+ delete the old code in the
same commit as you merge the vend= or branch=C2=A0in (so the old history will be
available more ofte= n)...

If it was direct committed to contrib, then = it's a vendor import=C2=A0+ subtree merge
+ maybe fixups for = FreeBSD. Vendor merges are just a convenience so that
future vend= or events are constrained...

These details likely = need to be documented, but what's the details here that
you n= eed to do?
=C2=A0
(2) given I couldn't see that mentioned either anywhere, for local
changes, they only live in main and stable/ but vendor doesn't have the= m
so in case of conflict they'll show up with the merge from vendor to main and need to be resolved then?

stab= le branches don't care about vendor branches (except in some rare cares=
that almost certainly won't pop up here). You are just mergi= ng changes in main,
via cherry-picking, into stable.=C2=A0
<= div>
Warner
--0000000000002b40120612f222a5-- From nobody Wed Mar 6 00:37:07 2024 X-Original-To: freebsd-git@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 4TqD605TTjz5DljV for ; Wed, 6 Mar 2024 00:37:12 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4TqD603DSNz41SR; Wed, 6 Mar 2024 00:37:12 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709685432; 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=qa1lgLGI5cQi+1PFp/d472NqufgI33g2MFKKCEG+YbU=; b=DOJk3VflcbJNTb+X4lJLZQwUOwN1tzN0K8ts6U2u/C8ni9cUXRC5YPlu9tWfT36K95/of1 hjKqXi+MH7lmbae/PinRDzoU3k7tg4LTa4jPrg7GfbZak/JWg3S6HmZkNNKUb7yDTBfv8b ZTjlZbNvcHoPzbrbjorP4KIk7rWfNRVy8Z/xmr2vuEJIO7U9mjLo0xsjYfja4faRwYLoib M7OpRIxrJKLM+iYTTeiSxCsWAt6t+tH1WEmvI6UA4cseXswUf7xHIkts7UR2fKepOsA/Ov fvEP/ADgnM4pXrIXK373PGR1UevfioFOTyDPM5PqofcqKdD1Nq84IOBnzR9GnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709685432; a=rsa-sha256; cv=none; b=idaFvzl3ZQbXyIyga7+dw9co3eRwGItPOmHJ1Iiei9EYgfV/Jz6o5ILicHol3Y2Ft3Uy9V ZRuwa0OrbEX5NL8iXU6W8taXZ8VTe5dKgB9LCe/kIDupBIOh3RUj1ieDHEd6tWdYm6WfUy WCJsQ+RE1rcowRNEle5eOwhewHE6c+2FzpjfBq3QHH9hmrBbhH3I/0CdxLRb+CECuRzRyq bvIjGnIR6IsRvN2QKxnidbmnAQMi7KFk8jxL68hBfVoSrj6gteln/meq+/Vh5NqZNrlMhY ttwujxbsE7RLWMSCgnGPwQgoIAE5qQR8fFI1TCCBBoa/Qdy0Vm0OeqS+PUvlyA== 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=1709685432; 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=qa1lgLGI5cQi+1PFp/d472NqufgI33g2MFKKCEG+YbU=; b=eHQ1XVxNfH+o/+Fyfn38SGbvbzPsvGW25VFTcmf35vb1t54X1WO4/kIOlrgEUb1VVufGHd 4azL9UGQab8IZlrFN0XdVy7EG3CWm4GksTlN4qu3xa1l21adcypP33V2FapeAPG8HrK6Zj 26H0t9aiXB4frnvYJi5QsZIZazXsaaPdR/chO4OJvCBzPiMJ/AoY++4xY2t8ewdlMDcM1o HbwXUAf928713zlJ7x2btCfoXuxiHq6PnDAQ9shPkjrcD5Z0W0m/o/C2KoWpio8InrPE78 VQPRy3uYadmLdi9k5DljLyJlkdfZWVh6F7oJSmiDU3pz2FR2/WDloLhP44Bfsw== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqD601RStz1Kt5; Wed, 6 Mar 2024 00:37:12 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id D36158D4A212; Wed, 6 Mar 2024 00:37:09 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id EFCBE2D029D8; Wed, 6 Mar 2024 00:37:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id SmhjcYxkQeaW; Wed, 6 Mar 2024 00:37:08 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id F210E2D029D2; Wed, 6 Mar 2024 00:37:07 +0000 (UTC) Date: Wed, 6 Mar 2024 00:37:07 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> References: X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-150881356-1709685428=:2366" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-150881356-1709685428=:2366 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Tue, 5 Mar 2024, Warner Losh wrote: > On Tue, Mar 5, 2024 at 2:46 PM Bjoern A. Zeeb wrote: > >> Hi, >> >> there's the edge case when we already have code in contrib which was >> previously directly committed and now should come out of a vendor >> branch. >> >> (1) how does one properly seed that case? >> > > Was it direct committed to contrib? Or somewhere else? If you are moving it > to contrib, just follow the process in the handbook + delete the old code > in the > same commit as you merge the vendor branch in (so the old history will be > available more often)... > > If it was direct committed to contrib, then it's a vendor import + subtree > merge > + maybe fixups for FreeBSD. Vendor merges are just a convenience so that > future vendor events are constrained... > > These details likely need to be documented, but what's the details here that > you need to do? I may want to track the (unchanged) versions of the LinuxKPI based wifi drivers in sys/contrib/dev so we can more easily diff against the latest upstream import and ship changes back etc. >> (2) given I couldn't see that mentioned either anywhere, for local >> changes, they only live in main and stable/ but vendor doesn't have them >> so in case of conflict they'll show up with the merge from vendor to >> main and need to be resolved then? >> > > stable branches don't care about vendor branches (except in some rare cares > that almost certainly won't pop up here). You are just merging changes in > main, > via cherry-picking, into stable. Right and local changes are in main and in case of conflict show up during the merge from vendor to main and get resolved during that merge like merge conflicts? Sorry, may sound too stupid question but I never worked with vendor branches in cvs/svn/or git before. -- Bjoern A. Zeeb r15:7 --1098556516-150881356-1709685428=:2366-- From nobody Wed Mar 6 16:59:34 2024 X-Original-To: freebsd-git@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 4TqdvZ2v1pz5CwP8 for ; Wed, 6 Mar 2024 16:59:38 +0000 (UTC) (envelope-from glebius@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 4TqdvZ2MmDz4lCJ; Wed, 6 Mar 2024 16:59:38 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709744378; 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=AkQvN/CdYaZ5J0SIq4c0SfesjSUCclAjemKejp643yQ=; b=XVBjwthK43IfOFI8J73w5D+JoSh+h1jRIW3igsY1TZoMW6Tvx64JqlOZ9/lSzEr3yVqFyU PCdYaDva21HE/jqf98ikCa/dqqCzOk2IO1BP/ifmaosBtnJPf4zZtyaJXd/yvNqQrGovVo IwLz+1HhTjJRw/8zGShS8/AKBRsxzZDClmT9Lwd+Gr4NxsnQDXZIW/1Vw0z7wuAymmmFC/ OIRH0AAwYXiabPdSOV+aw/2429htM/HUsBopFlSv6eTT1s+8HExmTXd7hnyLVMGCMWOn+L dUnO6cm1ZT3C4jJwPDurZKNNt303TfG/GRQiI5nlCdTBenHpmK1Ar4jg/6I07A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709744378; a=rsa-sha256; cv=none; b=wmR5veoGsKs9S5/38DKru8kk78Xdw7DqPvqnbSiorgTNWCAmQz4d0SeqrllnGw37xCRfDq SrF6yTRXodr91kPgi/ouVjsETf2tep7SFLLyYsgqRoolJQaEeyQWYujVTOBZU46p3HolYu FMEqMHskpUhgXLkZmYD9W/qM481FcElkEb+BV7hjdfbb8YyJAP9IskZ2BrWWthtKzFjc4G Ae9MYEUq/GyGO8cTBoXWh257Mv26KEGWMsZ0OhgfcskY08zOCfXEbjihEwbXIz5yZ0qNqH y7tTyxjCkST70mSFFj/XmnfMIliy7bWt/Q4umBPDJf3z1eAPSWeBxLrjppriDQ== 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=1709744378; 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=AkQvN/CdYaZ5J0SIq4c0SfesjSUCclAjemKejp643yQ=; b=LSlnut9kfPFLT10fNI0a2DXl9u0uce5JbggfLkwR4ry7YRiXODnLOOoUoHjY8qGFgvzSJs YMcFi2g0CX3KQafZSgndAgZZQEwDZczmLOi6OxOHPnmD+yl5D/nJ8/v2jDpS/aahBMTrEy GcDrukFXc1O7nmB85UhFEDyFhVMI53DTMCIW5NlddcwhOQtjWW4RRviMBVuBYngQ3lYlcv izGm1wAcESYzk7Cu0SRPzfen5O6Xh936YZdO6qxKlJksneCUG6atzP9ua9QjKIIqx4cbVD RINVBIwywmG+AccHh4zwvgkrqtj4bOx9VoihA0SAQEIf8oZaxnUVPs9cjoxtYw== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqdvY5hKxzRLW; Wed, 6 Mar 2024 16:59:37 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 6 Mar 2024 08:59:34 -0800 From: Gleb Smirnoff To: "Bjoern A. Zeeb" Cc: Warner Losh , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> Bjoern, On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: B> > These details likely need to be documented, but what's the details here that B> > you need to do? B> B> I may want to track the (unchanged) versions of the LinuxKPI based wifi drivers B> in sys/contrib/dev so we can more easily diff against the latest upstream B> import and ship changes back etc. Can you please give an example, e.g. this the the directory in our tree and this is the origin we want to make the vendor import from. I will experiment and produce a sequence of git commands you'd need to do to make proper subtree import. Warner will check me :) -- Gleb Smirnoff From nobody Wed Mar 6 18:12:19 2024 X-Original-To: freebsd-git@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 4TqgWh5WCJz5D33F for ; Wed, 6 Mar 2024 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqgWh3dkbz3wx8 for ; Wed, 6 Mar 2024 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a44e3176120so9338666b.1 for ; Wed, 06 Mar 2024 10:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709748750; x=1710353550; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=JoLBRKddTd837WasF5moLpBLHUEz2wvEfVKU63V1ZDM=; b=AGu9QIPxBtXQi1B0S95eH+KZoYkzYfoo/yHE3V5X45RTi9H6v9uTjOKasuxu89lhAH 9uPq3jUQwROSyd2TRI5k5h0XxEDOVUjFkD0cGw30D49hbg1wF75VJln7cSFQTPSYBB8o OBSg+x068FZhO3Bk+WrJDtWs3mh0LdxGCWpNruTcYOkbz/GunvpwqS48YBNxcqpXAA0t yNTJDBqQ1xChfEw3Cg+ozvq+FpEJRReXZSwfVH7qKN1pCC5jARg8StwNLX7gyYFTNLqH gbBNL8+f3CFQgLQsGmpN6Kif90Sku2d/IGRUH1nIbiMcDidHY4LkrV/we/1XRlF/lSqb i32A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709748750; x=1710353550; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JoLBRKddTd837WasF5moLpBLHUEz2wvEfVKU63V1ZDM=; b=QdkH+lwKGsFcJ3osSB+odK1FJA+2gGUEmzkcV04UVNHrcKGgcbafdx+6d+DtOzURUZ iUakk5FRyesy4fdM8gEeWfyacdzbhHyR9IISPbPQNR//goyR8XM+OM3b56C67F3DhXTT yhvOwq5o896wC+WONcI66dS5sssNUbuGOVV0peiwBWQVNotM+sG4ZxLyX0gO9T3qNCuY aQgfZgYuheUvVNC2XMbBz0VGWAk4ZZCCooi0oGuqAVbFqINW6X5SRlgT/ZYkVLOvXzk4 zXwFdAmjFQ6SmmVzabEB0JIH3WK8S7SQ34pTo+ZAILjdH3mrW/FmvD6DQWlIuPLebCJf MgvQ== X-Forwarded-Encrypted: i=1; AJvYcCWqfmcj7jquoWVIH04S6YDxP/Yfa2aef0m5gs3uxShnMrn7TsbfXVLiRVB612zyAhiZIWuuC9fmTUr6pV2LRK/ofi01CBhDOA== X-Gm-Message-State: AOJu0YxZWjtcn1bZbz/8z118F2YkEOB3CelpT/RpfT0Vyx6THnhqOtkN KqDMPKYh6dq0Hki6t4RTGnA1tEZt6PzBW3GCWWTURFOqqxGT1BUZLGWUtD57ro53GUYzZ/GIAKL x8NxXP56knGQHKsYVKlSTQoL1mqkr582KbZLj+Q== X-Google-Smtp-Source: AGHT+IF5v0zJj/cRT0Ij4yo0o4MIz66isXJA/G86mCXuetYP0T16V45RZNGVv28SKA99jCm7YXkALPzHjBlqOEMJzlw= X-Received: by 2002:a17:906:aa0e:b0:a45:4ba5:2917 with SMTP id ko14-20020a170906aa0e00b00a454ba52917mr6351693ejb.75.1709748750206; Wed, 06 Mar 2024 10:12:30 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> In-Reply-To: From: Warner Losh Date: Wed, 6 Mar 2024 10:12:19 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: Gleb Smirnoff Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000e96291061301e61c" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TqgWh3dkbz3wx8 --000000000000e96291061301e61c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff = wrote: > Bjoern, > > On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: > B> > These details likely need to be documented, but what's the details > here that > B> > you need to do? > B> > B> I may want to track the (unchanged) versions of the LinuxKPI based wif= i > drivers > B> in sys/contrib/dev so we can more easily diff against the latest > upstream > B> import and ship changes back etc. > > Can you please give an example, e.g. this the the directory in our tree a= nd > this is the origin we want to make the vendor import from. I will > experiment > and produce a sequence of git commands you'd need to do to make proper > subtree import. Warner will check me :) > He wants to do this with the Linux drivers we have in the tree... So we should get the version he started with, import that into the vendor branch (for each driver, since they are separately released and versioned). Once we do that, we can do a subtree merge, but we may have to jump through some hoops so we wind up back to the current files. I have ideas how to do this, but haven't done it yet. Once we have those, we can switch to updatin= g them via the standard vendor import stuff.... So I know I skipped an email in this change... if you, Bjorn, have the files / pointers or whatever that you started with, I can import those, do the merge, then we can look at updating. I'm hoping the number of changes are relatively small... Warner --000000000000e96291061301e61c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Mar 6, 2024 at 8:59=E2=80=AFA= M Gleb Smirnoff <glebius@freebsd.= org> wrote:
=C2=A0 Bjoern,

On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote:
B> > These details likely need to be documented, but what's the d= etails here that
B> > you need to do?
B>
B> I may want to track the (unchanged) versions of the LinuxKPI based wi= fi drivers
B> in sys/contrib/dev so we can more easily diff against the latest upst= ream
B> import and ship changes back etc.

Can you please give an example, e.g. this the the directory in our tree and=
this is the origin we want to make the vendor import from.=C2=A0 I will exp= eriment
and produce a sequence of git commands you'd need to do to make proper<= br> subtree import. Warner will check me :)

He wants to do this with the Linux drivers we have in the tree...

So we should get the version he started with, import that = into the vendor
branch (for each driver, since they are separatel= y released and versioned).
Once we do that, we can do a subtree m= erge, but we may have to jump through
some hoops so we wind up ba= ck to the current files. I have ideas how to do
this, but haven&#= 39;t done it yet. Once we have those, we can switch to updating
t= hem via the standard vendor import stuff....

So I = know I skipped an email in this change... if you, Bjorn, have the files / p= ointers
or whatever that you started with, I can import those, do= the merge, then we can look
at updating. I'm hoping the numb= er of changes are relatively small...

Warner=C2=A0=
--000000000000e96291061301e61c-- From nobody Wed Mar 6 18:19:39 2024 X-Original-To: freebsd-git@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 4Tqgh01ZZRz5D3d3 for ; Wed, 6 Mar 2024 18:19:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4Tqgh0130Lz3xy5; Wed, 6 Mar 2024 18:19:44 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709749184; 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=5AIARlhj/DB4MBtvqM1npVxc7DI9mnQALs6hmL73xpU=; b=Fqan8RS06iruLQGCpv/vIUpC+7i7pngFSoZpv+rSZ+VHodlv2Bdf//tTltbvl8yE7yFj0V Y3ma02tZStGQohiHnReTeK5EWzAzLQNC5YevthZcVTU+sZx8Dl7T8mYeNgA0/N21liz+52 HGcCssWcWkVnNcdCqgzTq13BsIC5QyZdtsoW9YHLrEF4E7VpGKSsZeqApUAUQAB2WQi3PN NlXA+AqLCpxFfUd9inwYFQs4lHsEOkkDkctWcWGpM293BTLaBMVfEmKNgKy8bikyx58IOc T7YWQWEcYDQfN+prkAJGOFqIDe8vHrJRJue/K8sELg1MkNe9UNwOlslIH0+sWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709749184; a=rsa-sha256; cv=none; b=fxxKCaSGLjZ31aeyA+/i0GVK8lKKOXVcrJuPAN9s7Y4cMn3awoJfyeSaYxhNMTs4Eu1PyJ wYjc/Nr05DFSnLmIk9ublyfi9mkEBNOH8omSsYAT2+MKkptlHOhftJOFWOcqn0SszsvuWI RSHN910b3lN5UvFHfs8/PxdeA211r7SeZojBsBQKnSe1GpvfKEI5o+hOTrRV4pjliP7tPH UqQTmnyY43eYPU3XzKRcgrnUsDGq77q/qRNB7sTRyJ94eIcZWj+MKsSKMdCdCxNWHjMGv6 BoY5xcv8SW0CbsOPQA//IVIa+/tHdsGnMt3NMbgYrNphA1GRwx5LVROWxs4MlA== 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=1709749184; 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=5AIARlhj/DB4MBtvqM1npVxc7DI9mnQALs6hmL73xpU=; b=qvTeUQRh5Y6Jzd4NUD2BMViY0AuQ6DeiNmj94CC9QJzVDyDWAXZAw+EV+eN3VjXc44Tz0m e6Onjzag/a72o2c05w9ea4wlPdyVGxoaVf8bSKSQmdNSbTvnHkAxdS+Jkuk6FYq7aUuY18 qd+A6fCXf+TQBtYK5mUh/ecIvJNdEL9JAQ2wj9C08yfxzIamVkqhZzhxyqW/aFhWwXeM1f 7/BBDthaJEbzhY0kNJp6qLWaSt5k7FkDD0l04AnfxiB6cOPzNePU3XdY5Elv597Y439ndZ J5Bdf4agsl6DINdrNkLkwMLKAjbJPxf+NT2/WGHVuovawJSQ1SG/Vl1X3+f2HA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tqggz6NhtzQld; Wed, 6 Mar 2024 18:19:43 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 9CD598D4A212; Wed, 6 Mar 2024 18:19:42 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id B66CF2D029D8; Wed, 6 Mar 2024 18:19:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id qwNytlVAgojI; Wed, 6 Mar 2024 18:19:40 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 7A3B02D029D2; Wed, 6 Mar 2024 18:19:40 +0000 (UTC) Date: Wed, 6 Mar 2024 18:19:39 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-200127782-1709749180=:2366" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-200127782-1709749180=:2366 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 6 Mar 2024, Warner Losh wrote: > On Wed, Mar 6, 2024 at 8:59 AM Gleb Smirnoff wrote: > >> Bjoern, >> >> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: >> B> > These details likely need to be documented, but what's the details >> here that >> B> > you need to do? >> B> >> B> I may want to track the (unchanged) versions of the LinuxKPI based wifi >> drivers >> B> in sys/contrib/dev so we can more easily diff against the latest >> upstream >> B> import and ship changes back etc. >> >> Can you please give an example, e.g. this the the directory in our tree and >> this is the origin we want to make the vendor import from. I will >> experiment >> and produce a sequence of git commands you'd need to do to make proper >> subtree import. Warner will check me :) >> > > He wants to do this with the Linux drivers we have in the tree... > > So we should get the version he started with, import that into the vendor > branch (for each driver, since they are separately released and versioned). > Once we do that, we can do a subtree merge, but we may have to jump through > some hoops so we wind up back to the current files. I have ideas how to do > this, but haven't done it yet. Once we have those, we can switch to updating > them via the standard vendor import stuff.... > > So I know I skipped an email in this change... if you, Bjorn, have the > files / pointers > or whatever that you started with, I can import those, do the merge, then > we can look > at updating. I'm hoping the number of changes are relatively small... I can probably produce (for each driver) a set of the original unmodified files which then went into FreeBSD with modifications if we do need the entire history and not just the set from the latest import? /bz -- Bjoern A. Zeeb r15:7 --1098556516-200127782-1709749180=:2366-- From nobody Wed Mar 6 19:26:00 2024 X-Original-To: freebsd-git@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 4Tqj8j5T5Zz5D8s1 for ; Wed, 6 Mar 2024 19:26:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqj8j1fcMz46Y9 for ; Wed, 6 Mar 2024 19:26:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a458eb7db13so12463466b.2 for ; Wed, 06 Mar 2024 11:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709753172; x=1710357972; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=U2GqVBp0eMNYKaFkA/8KtXoqHBJ4l2ZIrTDp6DqseUI=; b=iPhFzylUjLFVgqYva+xpSopNa+OBnfZGXmimTXW5SnHSxSoKsgcbf+iess40dmk8iw IQ4wawH3hR5hpSAGtFqpddSTCoyoKgOGlFTX8rEGNRm5EtDSH3I0QzCY3s1nHYMzP9+a 6RILLT6b5tuP4LzGtV+2KDL9ksdAfE87nGBxkXMhPzItVBp36U33m5mBl4Rvbb2/LW6Z CBQxYuwq4SV/BiuBWYWXa3B/rtVyFmEd4aJNlcank/RfDTrIO/kPW51rgZWDL0+Gh+Lr gCl/Udc6cjcXYVARfRVZXrmIkI109YQUBEjjW02cz18TvhTbkCk4A0kluOpFcBC9v9nj xxxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709753172; x=1710357972; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=U2GqVBp0eMNYKaFkA/8KtXoqHBJ4l2ZIrTDp6DqseUI=; b=kG/i8THi7YmfgB6RoBBc14ZbJoRn+3p02gKUFfR0zM/yZysXEoNvPst46m9E4IdY8d xbuSaWgvxEyuv+emr0diuFVY5dDIG5R6xrLA106DLVj4vXVJUrlDDv6lmSwnHWhKUY7i PnYStLMilZLf5i+Sfu7V2Q+8f7aXfns8f9hXaOry3kymLeHIOXnHLaIpz0KUVsm+h5Te UyhGJ2fUnEzzL/xhJXW/woyk0lhPyTZTwu+7halJFr0L3YWZ6CqGBEeVrvrPPBK4ppNg 66uVJ7MTO5d6/dQnBhRoyAz8Kcn7EaE/UInIDytoHwiCbP7f2rA5XcwrT2vFy8YE/6Ij YCVw== X-Gm-Message-State: AOJu0Ywo7Qo/v0niaCCyVTdLhCGJOdjTQj4Lqo0RxBDFFXVDHDWIgQ+e 8QjMnuDp8hWeKEjfpwfkSxQMav+cDkiu7+oP36uZPe4S9+8WxmwfOVL52DeHBoA6Wx36vaiEscl LjUbj0t5CAXU1o1BVnsR9KcXUM7aQff6rOCLWSUXpqdcIBdRdaNI= X-Google-Smtp-Source: AGHT+IHXeoTMqs2Ga5sC8Ny9xB0W+4WCLlylcsK0XbqDVffAk8pK32B/W4qojKu9fh2oAIu5En1OhNPN3OPcTDGobU4= X-Received: by 2002:a17:906:d92d:b0:a43:fa38:901d with SMTP id rn13-20020a170906d92d00b00a43fa38901dmr10851706ejb.45.1709753171495; Wed, 06 Mar 2024 11:26:11 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> In-Reply-To: From: Warner Losh Date: Wed, 6 Mar 2024 11:26:00 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="00000000000070ec06061302ee84" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Tqj8j1fcMz46Y9 --00000000000070ec06061302ee84 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Mar 6, 2024 at 10:19=E2=80=AFAM Bjoern A. Zeeb wro= te: > On Wed, 6 Mar 2024, Warner Losh wrote: > > > On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff > wrote: > > > >> Bjoern, > >> > >> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: > >> B> > These details likely need to be documented, but what's the detail= s > >> here that > >> B> > you need to do? > >> B> > >> B> I may want to track the (unchanged) versions of the LinuxKPI based > wifi > >> drivers > >> B> in sys/contrib/dev so we can more easily diff against the latest > >> upstream > >> B> import and ship changes back etc. > >> > >> Can you please give an example, e.g. this the the directory in our tre= e > and > >> this is the origin we want to make the vendor import from. I will > >> experiment > >> and produce a sequence of git commands you'd need to do to make proper > >> subtree import. Warner will check me :) > >> > > > > He wants to do this with the Linux drivers we have in the tree... > > > > So we should get the version he started with, import that into the vend= or > > branch (for each driver, since they are separately released and > versioned). > > Once we do that, we can do a subtree merge, but we may have to jump > through > > some hoops so we wind up back to the current files. I have ideas how to > do > > this, but haven't done it yet. Once we have those, we can switch to > updating > > them via the standard vendor import stuff.... > > > > So I know I skipped an email in this change... if you, Bjorn, have the > > files / pointers > > or whatever that you started with, I can import those, do the merge, th= en > > we can look > > at updating. I'm hoping the number of changes are relatively small... > > I can probably produce (for each driver) a set of the original > unmodified files which then went into FreeBSD with modifications > if we do need the entire history and not just the set from the latest > import? > How many versions are there? Warner --00000000000070ec06061302ee84 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Mar 6, 2024 at 10:19=E2=80=AF= AM Bjoern A. Zeeb <bz@freebsd.org&= gt; wrote:
On We= d, 6 Mar 2024, Warner Losh wrote:

> On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff <glebius@freebsd.org> wro= te:
>
>>=C2=A0 =C2=A0Bjoern,
>>
>> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: >> B> > These details likely need to be documented, but what= 9;s the details
>> here that
>> B> > you need to do?
>> B>
>> B> I may want to track the (unchanged) versions of the LinuxKPI= based wifi
>> drivers
>> B> in sys/contrib/dev so we can more easily diff against the la= test
>> upstream
>> B> import and ship changes back etc.
>>
>> Can you please give an example, e.g. this the the directory in our= tree and
>> this is the origin we want to make the vendor import from.=C2=A0 I= will
>> experiment
>> and produce a sequence of git commands you'd need to do to mak= e proper
>> subtree import. Warner will check me :)
>>
>
> He wants to do this with the Linux drivers we have in the tree...
>
> So we should get the version he started with, import that into the ven= dor
> branch (for each driver, since they are separately released and versio= ned).
> Once we do that, we can do a subtree merge, but we may have to jump th= rough
> some hoops so we wind up back to the current files. I have ideas how t= o do
> this, but haven't done it yet. Once we have those, we can switch t= o updating
> them via the standard vendor import stuff....
>
> So I know I skipped an email in this change... if you, Bjorn, have the=
> files / pointers
> or whatever that you started with, I can import those, do the merge, t= hen
> we can look
> at updating. I'm hoping the number of changes are relatively small= ...

I can probably produce (for each driver) a set of the original
unmodified files which then went into FreeBSD with modifications
if we do need the entire history and not just the set from the latest
import?

How many versions are there?

Warner=C2=A0
--00000000000070ec06061302ee84-- From nobody Wed Mar 6 19:44:33 2024 X-Original-To: freebsd-git@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 4TqjYx50bWz5DBGZ for ; Wed, 6 Mar 2024 19:44:37 +0000 (UTC) (envelope-from bz@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 4TqjYx4SMXz49Qb; Wed, 6 Mar 2024 19:44:37 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754277; 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=iuDZb2n5UbXeRMWDaRqy2w/het4xaRgUWwAbz7kawdg=; b=Ua7RUyjrjLzH7ixETAU28lWJjMZHLIQ5DkLqGRpSpOxsAtzOau0cpwiXZHKWB8IMOISjS0 KRf4+eK9L7wQn8RnIyR+kZxFku939wPDOMJu5ffxNZHNN+u5/6sEOsNmZ75uEPZkFgkvhc SKVZz26imaTiH8Ek1jKskZx4xK2NvIEstuBwyhNmNAxoQUzF2SUfQpw1lVa44nQ43x/Tv+ sQTGCrUYizf61Y+ZjGC4le1+kgwaylg20zjy2Dq6ekqMigisEiIpV5EtBn1nZRyGvF02ZB 2kmUI8D8/uPJYbBMzVofhoxnBgKXl59cC1S4vUylwBNuQ5GsGvxMSzrALtyjYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709754277; a=rsa-sha256; cv=none; b=Fm+ib5a24xAwDQA7GAcUC59CSuUYPMiAbYSA868tsqR0r/iwTDUftauc9KQ4RIr+8/gUrR 6mhJp0CwkMtrPrYaqM745aSdjHE6cW1yvSs0PSd1WwQqW5BeTY3fk1NT1NJn4i5T0ZH490 Rj+IS1zSxZY7baOKRZ4L76cR3OCka1qGufriaENR58GSKR2piZ4Hi/TRaj982cfGaIF+HN mMgdYvcoH/uXGclpqUo9CLvw/3sAT29SSctzZCY5K9Lhnd6oia1II8+BJAYSsS9hM29vJC /EBKy2gjBhRnNZIvqUl1i6ZSM4De18nlhkaDJ8GiQl8pxPegcMJ7RJMMBBCL7g== 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=1709754277; 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=iuDZb2n5UbXeRMWDaRqy2w/het4xaRgUWwAbz7kawdg=; b=shUEhF7EjELBRbftqPGm+psidbG/7xhhI9Lwh0HYE2eO2fwmHEDM6pAXo5HlxHaiOP7NrX ALgyxWEiKCEUyOpIZy70epyKed+gfnapEThUTPmKxfF7U4WJ88sa7M6borBp640jpULvSM WTC+IImBSdlhhC7LweU8x19ZrvqmBCk/LPwzjmpTwkUT0gjn/d3wDc/T4S2pXDaxGVplfT lptIXjz6tThgufXdNiO9HzXyw/bnAjaHa51CIrD5gASegbMF+wvy1TchddSt3MrXgp7AK4 Ng5M3WBZAA2TuqJphqT6qKwJGDjLWbN6Q0Ma73dAMPmcbp1B8OuTYAFcSVpesQ== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqjYx2jqrzVHJ; Wed, 6 Mar 2024 19:44:37 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id A64E08D4A235; Wed, 6 Mar 2024 19:44:35 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id DED092D029D9; Wed, 6 Mar 2024 19:44:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id XKZWyLyAEDYM; Wed, 6 Mar 2024 19:44:34 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id CF3F02D029D2; Wed, 6 Mar 2024 19:44:33 +0000 (UTC) Date: Wed, 6 Mar 2024 19:44:33 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-1002525340-1709754273=:2366" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1002525340-1709754273=:2366 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 6 Mar 2024, Warner Losh wrote: > On Wed, Mar 6, 2024 at 10:19 AM Bjoern A. Zeeb wrote: > >> On Wed, 6 Mar 2024, Warner Losh wrote: >> >>> On Wed, Mar 6, 2024 at 8:59 AM Gleb Smirnoff >> wrote: >>> >>>> Bjoern, >>>> >>>> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: >>>> B> > These details likely need to be documented, but what's the details >>>> here that >>>> B> > you need to do? >>>> B> >>>> B> I may want to track the (unchanged) versions of the LinuxKPI based >> wifi >>>> drivers >>>> B> in sys/contrib/dev so we can more easily diff against the latest >>>> upstream >>>> B> import and ship changes back etc. >>>> >>>> Can you please give an example, e.g. this the the directory in our tree >> and >>>> this is the origin we want to make the vendor import from. I will >>>> experiment >>>> and produce a sequence of git commands you'd need to do to make proper >>>> subtree import. Warner will check me :) >>>> >>> >>> He wants to do this with the Linux drivers we have in the tree... >>> >>> So we should get the version he started with, import that into the vendor >>> branch (for each driver, since they are separately released and >> versioned). >>> Once we do that, we can do a subtree merge, but we may have to jump >> through >>> some hoops so we wind up back to the current files. I have ideas how to >> do >>> this, but haven't done it yet. Once we have those, we can switch to >> updating >>> them via the standard vendor import stuff.... >>> >>> So I know I skipped an email in this change... if you, Bjorn, have the >>> files / pointers >>> or whatever that you started with, I can import those, do the merge, then >>> we can look >>> at updating. I'm hoping the number of changes are relatively small... >> >> I can probably produce (for each driver) a set of the original >> unmodified files which then went into FreeBSD with modifications >> if we do need the entire history and not just the set from the latest >> import? >> > > How many versions are there? - iwlwifi I think it is 5 full versions (and 3 or 4 "remote cherry picks" in between in case it matters) - rtw88 probably 3 versions - the others {rtw89, ath10k, ath11k, ath12k, mt76} I think it was only 2 each. -- Bjoern A. Zeeb r15:7 --1098556516-1002525340-1709754273=:2366-- From nobody Wed Mar 6 23:51:11 2024 X-Original-To: freebsd-git@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 4Tqq2j5wMBz5Dfr4 for ; Wed, 6 Mar 2024 23:51:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqq2j1tBCz4fVy for ; Wed, 6 Mar 2024 23:51:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a458eb7db13so41244266b.2 for ; Wed, 06 Mar 2024 15:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709769084; x=1710373884; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=tgz/UMurgMVN9Eh4oarsK6Q/JAWdcm8HPLY5Y/quWaE=; b=vL8xezOlDdu3HGeyxsijNN8zITWBMb/drKnQweL2KEqov+LIcvzFbbAcpeotiKvSLD 8awcsuzPUFH5lzWRJyRJwe64Ra1ng2cm29y7FiThQG9BU36kQiwKYy/EWF0VhMHYF5sj inY2awrAA02OQH/AMPVmrcYnaeP9mjp1Jw8PBt/r0svSPPLHYHz8NtJej+l7eTe24VXe 9WsI8DZJtN/TDrQ42ahjtHTpDEFqH38OCMD84dRa8KOOw5fjzwjUPeXA+X7kZQfSaogw c1mx7+FhnbOVTTcLa1sgLlK+sdtU9y+EefTaILZW7xF4J5GWuXXokvd7dek8ZP8Slak/ MM0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709769084; x=1710373884; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tgz/UMurgMVN9Eh4oarsK6Q/JAWdcm8HPLY5Y/quWaE=; b=wNJfFORPHrz7HAZwPmuvRv3SKVzFMZR4YBRtbsHYT3RGma0raqD5Kxc02I0TL/IY44 MFMxbXb3KEV8+5Ge1m0EAwXmq2/gITVYYseDTAjGskJN7tWZa6Llj4P9L6ML9bsh4QHf /xa31u7JYsKMQNEddIS8ZlXFhN2Q656DCF+1GU0XPWbLln6n/cqA7tt44MZlSS2U6FA8 vc8vqSJ7fy0KQAGThWACfT9WXvaqw2jT4FmzY74+CzVWmvHLiOZJa31jLvoeJmEx+3KV K4ORhEACtAaJnwcuzl7anxJfnzQUcyKur/WQbZkUrTCuaUc3W15+hp/Qb1BVVbG6puP9 fR/g== X-Gm-Message-State: AOJu0YwKXmIqp132kjRsSd7XRfwdutMCgzfMdy4JxIOcaVNz+zkH6S3A efzpnCaArU+hGCqad/KodlUe64ro4b3GsvpLXjsklHIOOcGCDVn2sB09YuzHlqg90gm+SEE8l0G doIOw+tfHl9X6j96/dzn8at/p6UW3qNBAqk5WAQ== X-Google-Smtp-Source: AGHT+IExEfTUCQEKiIKiFqifuz3N8EV+q9UnOoSdpySHCJmKKI5WbpyBXBoAvnnJuNrcpf+DKa79SKU66hl7YTYafv8= X-Received: by 2002:a17:906:1188:b0:a44:1929:6b90 with SMTP id n8-20020a170906118800b00a4419296b90mr11948462eja.27.1709769082926; Wed, 06 Mar 2024 15:51:22 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> In-Reply-To: From: Warner Losh Date: Wed, 6 Mar 2024 15:51:11 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d611ab061306a240" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Tqq2j1tBCz4fVy --000000000000d611ab061306a240 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey Bjoern, On Wed, Mar 6, 2024 at 11:44=E2=80=AFAM Bjoern A. Zeeb wro= te: > On Wed, 6 Mar 2024, Warner Losh wrote: > > > On Wed, Mar 6, 2024 at 10:19=E2=80=AFAM Bjoern A. Zeeb = wrote: > > > >> On Wed, 6 Mar 2024, Warner Losh wrote: > >> > >>> On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff > >> wrote: > >>> > >>>> Bjoern, > >>>> > >>>> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb wrote: > >>>> B> > These details likely need to be documented, but what's the > details > >>>> here that > >>>> B> > you need to do? > >>>> B> > >>>> B> I may want to track the (unchanged) versions of the LinuxKPI base= d > >> wifi > >>>> drivers > >>>> B> in sys/contrib/dev so we can more easily diff against the latest > >>>> upstream > >>>> B> import and ship changes back etc. > >>>> > >>>> Can you please give an example, e.g. this the the directory in our > tree > >> and > >>>> this is the origin we want to make the vendor import from. I will > >>>> experiment > >>>> and produce a sequence of git commands you'd need to do to make prop= er > >>>> subtree import. Warner will check me :) > >>>> > >>> > >>> He wants to do this with the Linux drivers we have in the tree... > >>> > >>> So we should get the version he started with, import that into the > vendor > >>> branch (for each driver, since they are separately released and > >> versioned). > >>> Once we do that, we can do a subtree merge, but we may have to jump > >> through > >>> some hoops so we wind up back to the current files. I have ideas how = to > >> do > >>> this, but haven't done it yet. Once we have those, we can switch to > >> updating > >>> them via the standard vendor import stuff.... > >>> > >>> So I know I skipped an email in this change... if you, Bjorn, have th= e > >>> files / pointers > >>> or whatever that you started with, I can import those, do the merge, > then > >>> we can look > >>> at updating. I'm hoping the number of changes are relatively small... > >> > >> I can probably produce (for each driver) a set of the original > >> unmodified files which then went into FreeBSD with modifications > >> if we do need the entire history and not just the set from the latest > >> import? > >> > > > > How many versions are there? > > - iwlwifi I think it is 5 full versions (and 3 or 4 "remote cherry picks" > in > between in case it matters) > > - rtw88 probably 3 versions > > - the others {rtw89, ath10k, ath11k, ath12k, mt76} I think it was only 2 > each. > It might be useful to have all the versions imported. At this point, though= , I do not know how to add the dependency arc to the right point between thes= e and the now-historical imports. There's extensions to add parents, but I don't think it would work for this. So, the minimum we need is the latest versions. Creating a 'as merged' tree from them will help future imports, which is the primary goal, I'd argue, for the vendor trees. If we imported each of the versions (exclusive of the cherry-picks). in order and then merged, this would give us a better history. The commit messages of the old versions could include the hash where it was committed to the tree's main branch. This might be wise, since it would allow us to add these links in the future if that functionality is added to git (or someone cures me of my ignorance). I think that if these versions were trivial to get, we should do it. If they are a hassle, then we can forego them. The possible future benefit is speculative at best, so if there's more than a tiny amount of hassle, we should skip doing each version. Warner --000000000000d611ab061306a240 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hey Bjoern,

On Wed, Mar 6, 2024 at 11:= 44=E2=80=AFAM Bjoern A. Zeeb <bz@freeb= sd.org> wrote:
On Wed, 6 Mar 2024, Warner Losh wrote:

> On Wed, Mar 6, 2024 at 10:19=E2=80=AFAM Bjoern A. Zeeb <bz@freebsd.org> wrote:
>
>> On Wed, 6 Mar 2024, Warner Losh wrote:
>>
>>> On Wed, Mar 6, 2024 at 8:59=E2=80=AFAM Gleb Smirnoff <glebius@freebsd.org= >
>> wrote:
>>>
>>>>=C2=A0 =C2=A0Bjoern,
>>>>
>>>> On Wed, Mar 06, 2024 at 12:37:07AM +0000, Bjoern A. Zeeb w= rote:
>>>> B> > These details likely need to be documented, but= what's the details
>>>> here that
>>>> B> > you need to do?
>>>> B>
>>>> B> I may want to track the (unchanged) versions of the = LinuxKPI based
>> wifi
>>>> drivers
>>>> B> in sys/contrib/dev so we can more easily diff agains= t the latest
>>>> upstream
>>>> B> import and ship changes back etc.
>>>>
>>>> Can you please give an example, e.g. this the the director= y in our tree
>> and
>>>> this is the origin we want to make the vendor import from.= =C2=A0 I will
>>>> experiment
>>>> and produce a sequence of git commands you'd need to d= o to make proper
>>>> subtree import. Warner will check me :)
>>>>
>>>
>>> He wants to do this with the Linux drivers we have in the tree= ...
>>>
>>> So we should get the version he started with, import that into= the vendor
>>> branch (for each driver, since they are separately released an= d
>> versioned).
>>> Once we do that, we can do a subtree merge, but we may have to= jump
>> through
>>> some hoops so we wind up back to the current files. I have ide= as how to
>> do
>>> this, but haven't done it yet. Once we have those, we can = switch to
>> updating
>>> them via the standard vendor import stuff....
>>>
>>> So I know I skipped an email in this change... if you, Bjorn, = have the
>>> files / pointers
>>> or whatever that you started with, I can import those, do the = merge, then
>>> we can look
>>> at updating. I'm hoping the number of changes are relative= ly small...
>>
>> I can probably produce (for each driver) a set of the original
>> unmodified files which then went into FreeBSD with modifications >> if we do need the entire history and not just the set from the lat= est
>> import?
>>
>
> How many versions are there?

- iwlwifi I think it is 5 full versions (and 3 or 4 "remote cherry pic= ks" in
=C2=A0 =C2=A0between in case it matters)

- rtw88 probably 3 versions

- the others {rtw89, ath10k, ath11k, ath12k, mt76} I think it was only 2 ea= ch.

It might be useful to have all the = versions imported. At this point, though,
I do not know how to ad= d the dependency arc to the right point between these
and the now= -historical imports. There's extensions to add parents, but I don't=
think it would work for this.

So, the m= inimum we need is the latest versions. Creating a 'as merged' tree = from
them will help future imports, which is the primary goal, I&= #39;d argue, for the vendor
trees.

If we= imported=C2=A0each of the versions (exclusive of the cherry-picks). in ord= er and
then merged, this would give us a better history. The comm= it messages of the old
versions could include the hash where it w= as committed=C2=A0to the tree's main branch.
This might be wi= se, since it would allow us to add these links in the future if that
<= div>functionality is added to git (or someone cures me of my ignorance). I = think that
if these versions were trivial to get, we should do it= . If they are a hassle, then we
can forego them. The possible fut= ure benefit is speculative at best, so if there's
more than a= tiny amount of hassle, we should skip doing each version.

Warner
--000000000000d611ab061306a240-- From nobody Thu Mar 7 17:58:15 2024 X-Original-To: freebsd-git@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 4TrH8q19MBz5DX6J for ; Thu, 7 Mar 2024 17:58:19 +0000 (UTC) (envelope-from glebius@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 4TrH8q0jCZz4PnL; Thu, 7 Mar 2024 17:58:19 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709834299; 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=vsQjuTZUIoeS1IrKY57vtDac162pKFzSKlKsVZ64uX8=; b=kYXq0L0E8gr3Dz27cMEyG0mq7Gvvg7fDTpG/WBzs1rBjTmlxMbFUwmd/65Mx9zbUWdAmWm wqrOHestq8woC72nOmj3mq8vIs+l64FUEa9doUOkSnGRqcHs4U+K53qX5pkfFPzyuPZHwo y2FHWr8kIDIe6MvcubNT5nhFT4qOwlHQyCF+LjosLe6hF1VbcKccTn2PqSDSfzghJFLkRu 7ZJ7DX3I76tgWfoRNVZKjf4ZAIPu7VIgndib2Y8eWO8DefBBGALH4d7PsdoNExHFZp7Cez 4NpKILLZl9WNX17+8rFG/60GXHM8kWVcQm/jzIhuIAKDprFO+HT1UXejIaMapQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709834299; a=rsa-sha256; cv=none; b=uAo9f0TxN/U7MJHdc2arBHZu4rz/dHjMxqNTZQhGk1s6A+qsLhzMgEE7N1TUessNLZ1KSg 81v59ATcRiWOuiF2sFStaLXH9NU5P2ExdvoVJWNyrybQG/FYKDwVHUHizweH1LSOV7T/gN XAzmf5TypB1NvCvItk9H+FVs5tvqLuhJ2V+i3hSGEjZf9q8OFijoWS83aaeLXtL/K+Iyod rmDX+BTS1l1Twa3MuHpGDddc92K1eyu7+n+vmvJXD1W69o6hDUkCRG19e3Ioiw8u+YuQda R76eAVCScQykU4ZJYdXQcBkpgGQru92/QkXjEDZWwOMj7xCKbv4AVKjiN8DoSQ== 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=1709834299; 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=vsQjuTZUIoeS1IrKY57vtDac162pKFzSKlKsVZ64uX8=; b=A3i4d+Wp/yuf5PQJX2rpi8uEJvhNxRTFfA75XW2HMyNTPqOx0JtnMkVmCw42+bCBnqGl3J dvAloPQEIhpY6HYJnsXUC5uwmHdqmbt3aCcmyeWDWmiCzb9FNMYhaM7qTbUEN0DTW7mhQP qJf+IanvHGGV7izUOVQ69LOEZV+PLpXeRM0qR6C/9nwsHEURbhgjZwmTt5AkIK0L7pjcTB rmLFvuzlcK6ug85+fZIcBtt9t3ObK+Kl2ijf04mbCyc4DC6HhE6X8bEz32fshQIZw3qsCm nKn4kSlzfao7EiD5EBBAfgqususKHbvr/y3+6HBLcA97p8+4kMXsTjuPA/CzqA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrH8p4D75z1Bv2; Thu, 7 Mar 2024 17:58:18 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 7 Mar 2024 09:58:15 -0800 From: Gleb Smirnoff To: Warner Losh Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: W> If we imported each of the versions (exclusive of the cherry-picks). in W> order and W> then merged, this would give us a better history. The commit messages of W> the old W> versions could include the hash where it was committed to the tree's main W> branch. W> This might be wise, since it would allow us to add these links in the W> future if that W> functionality is added to git (or someone cures me of my ignorance). I W> think that W> if these versions were trivial to get, we should do it. If they are a W> hassle, then we W> can forego them. The possible future benefit is speculative at best, so if W> there's W> more than a tiny amount of hassle, we should skip doing each version. Well, if the upstream is a true git repo, then we don't need to care about versions, we can take it with full history as 'subtree add'. Then, replay our commits on top. The downside is that each file will have two histories, and it would require some effort when you call git log to get the correct one. The repo bloat will not be large as the objects would be the same, it would be only extra commits metadatas. This all will look like a small version of what we have at Netflix, where we followed unofficial FreeBSD git repo and then switched to the official one. In practice it seems to work well, although a perfectionists would not like doubled commits deep in the past. Bjoern, can you please point me at upstream source of truth? Is it a repo, or what is it. -- Gleb Smirnoff From nobody Thu Mar 7 18:04:05 2024 X-Original-To: freebsd-git@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 4TrHHY64ktz5DXSK for ; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@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 4TrHHY5Sllz4QTl; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709834649; 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=nIOh1ktW8GnxGj439OWSukqsyj3hUOVDhD4riA1JQWA=; b=OiSfCYvUFlLtu4/QmgEfmMKah4l1N8cxCLrH116BzVgHCI6gxvlPzIxhsmxS0ToZAY+1n6 1PGzkMB4kx24lEfsmuuIe8qwNam67Vm9YV+1Y2k63VZZiF6wwIrhCdT0bLhGjp+8guMj0F tyro7CI3TQpAYbg1Io6Zn1ueIqFVwmu7SaVgb2+gCLnZnrypLQ0rfn276r1fPsMHGfxZxQ ijIuL85DBtSVhCYEhxNCznSZbH/ZX0ISreQJLPLWIajRbpcWR3pyeIt2gal3MNJ8BD6AnI BqddCdRmUWcD+tWzQdbVISAoC3VVNsRDa8PPhN2On0o+SRLDVMHDyrha9eJskQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709834649; a=rsa-sha256; cv=none; b=ms7ZJZ9+e7hhchSFHEjxzPt6TUG7W00tUXCdLED78GXPAGngMhP+St60TovXEnRlBfQX6b 6Dzsj1xiMFAKwL19C+Gle5KzxQdPx85D9jMjvXI5MYnSNbUL0q00cy/7S7rviQu471FP2c xeCy3/MbnV2iYUWEdjVP0PTKnuuMxRChC+irzIi81xCEog8pRNG0bpbXHcRH0YMGHPqJrv hJdY/i7sqH0djbMj7II4M/J0bOxD8Dxa54po1fbl4w94PuvSTKBEYWUlZc08+TdI+Rn/rE XTwMN/SgiUM3Ou4ABEUcjAuZ15+q/0bRRbl7sPfb9CkDFB2A3Q50cUOuxecOFw== 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=1709834649; 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=nIOh1ktW8GnxGj439OWSukqsyj3hUOVDhD4riA1JQWA=; b=vQwEqUy7WnChVvybmzVImz9Vg7dqM5Vuv6yaTxF1XgczcsblM0DRcspcsVXJzYIvHjry58 j3fyzDAFA8JHLFvjib6yqrPYkc3xeMbK8XieqNRxU8b8yjfTegr+97NCeBEaUWwQ8GqgK2 mRFNtfGLoQ/NTRtBAR0PbgOINB0sjrvu0F6An49M1p9PPYF/8T20iYFVScLX/bwuwM1u+Q 301wg+1moSpxQDYkBE4d+tJPvhuBj9wOnAeTFjVFl4YgR4k85kSCixcoUUvroXrFQzLWKB iivX9nmwJtK3TgGfIWOhmmo1ji2k6VyICMVzjTkuyNkOyQ0/a8JmUNFHmSPkyA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrHHY3hJHz1BQS; Thu, 7 Mar 2024 18:04:09 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 3CFF28D4A214; Thu, 7 Mar 2024 18:04:08 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6EB2C2D029D8; Thu, 7 Mar 2024 18:04:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id ZuQTfFWXVyNn; Thu, 7 Mar 2024 18:04:06 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 473FC2D029D2; Thu, 7 Mar 2024 18:04:06 +0000 (UTC) Date: Thu, 7 Mar 2024 18:04:05 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: Warner Losh , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Thu, 7 Mar 2024, Gleb Smirnoff wrote: > On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: > W> If we imported each of the versions (exclusive of the cherry-picks). in > W> order and > W> then merged, this would give us a better history. The commit messages of > W> the old > W> versions could include the hash where it was committed to the tree's main > W> branch. > W> This might be wise, since it would allow us to add these links in the > W> future if that > W> functionality is added to git (or someone cures me of my ignorance). I > W> think that > W> if these versions were trivial to get, we should do it. If they are a > W> hassle, then we > W> can forego them. The possible future benefit is speculative at best, so if > W> there's > W> more than a tiny amount of hassle, we should skip doing each version. > > Well, if the upstream is a true git repo, then we don't need to care > about versions, we can take it with full history as 'subtree add'. > Then, replay our commits on top. The downside is that each file will > have two histories, and it would require some effort when you call > git log to get the correct one. The repo bloat will not be large as > the objects would be the same, it would be only extra commits metadatas. > > This all will look like a small version of what we have at Netflix, > where we followed unofficial FreeBSD git repo and then switched to > the official one. In practice it seems to work well, although a > perfectionists would not like doubled commits deep in the past. > > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. yes, it's three or four or five different repos with the full linux kernel in it; nothing you want. And I believe we do not do subtrees in FreeBSD official. I'll go and prepare the different versions locally the next days for each driver and then we can see. /bz -- Bjoern A. Zeeb r15:7 From nobody Thu Mar 7 18:04:53 2024 X-Original-To: freebsd-git@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 4TrHJg15S2z5DXBn for ; Thu, 7 Mar 2024 18:05:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrHJf4fHBz4QbV for ; Thu, 7 Mar 2024 18:05:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a4467d570cdso5166b.3 for ; Thu, 07 Mar 2024 10:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709834705; x=1710439505; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=uZxRUKHDMkD4tHJH2ywH3yYHQXdcfYe9QYj4IfpFZeE=; b=fIR5H/9/1kWb4ANTAT3h8dT3q7XIhUbFGbttf1xeVoeg4ZjvjKI1uPzM8yltUS3zI4 SkbOBbRGWVGCX2bP+2k8OqXxnC40TQ6waR7bpGURbX1stir4upR/x7ezJlYVYepYuI6k tlQ2h6YRYVJqBhsXkZZMcA5egYIgNdus9zV1pqKInPZwNyIfZqEwl/vSMdQsiS1t4+1/ 8ci3lIg/oeiYHex/E95IVWb7xJNBRaxHZvf0lisa62cpX2n0OOA9CveJJN3WeZ8+r5OD Kw835DOjuPG8H6fol9E5qgeZKYU7/4krQC3Ji5ytLjCECdjzO6IN2Cnog+vy9v8b07/F yEpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709834705; x=1710439505; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uZxRUKHDMkD4tHJH2ywH3yYHQXdcfYe9QYj4IfpFZeE=; b=vauliGqGSU8BRGMm9dEM6dqCRBQS/wHtLuQv9Vi1SUuSpEayj6b8P7AMhkWEUcCroY Bu+mzC3SyjgLwrBNKgCagV01Zsb+UnsC+JfKCLzMyWiL5O30FzE3aP1z6ZrUiupzdaVB 4D1rc/cc6q5yiUL5Lf4aKi+ZNTBYoRyfAoLgcFmPiUd+UlnlECs9lhStxod49CMaboP5 IFJd638Pg/4N/WxWZnOeEu5vPTFsMJkWEB4rRwAdMK4elTMdAHG6RbYm0XD+vBWinyjH FBam9MxMLMOwGYU4w7+KunyU7h4T0npKjcjyDzfBgKyARG49t9gsjKRtVx8jvNG1jFu0 O0iA== X-Forwarded-Encrypted: i=1; AJvYcCWTNawCOmBPz1vAV3POYhU19KKzyHWhxj0UOHmphs4cUFd4VoDbkOHthwGJASJiYZjZcHpb0lDUQXvxp7icuBxhxwt1HZ9bhA== X-Gm-Message-State: AOJu0Yx5s7dEM1uHEd+sBVg7Ya85JYdIIfcxLVM/vP3kA0pKjxxIdabh KBn5E1w4AuNX6dgruSvT0/Ay94m4sATFnG752wLAaryHlrg+jok1M6qC1Jg69YLG/msSA9QBIzt BxXTfADED+J/3pwgmmmoLJ9vB9UpYC2YEta6Kng== X-Google-Smtp-Source: AGHT+IGwcVX/NQhZuDeTc8cn/bsWR5aLpKKozF/EbpQ1oFymzNVKt/UWQ1Uo9By6tNgt6X3Qk/o/EaaZo9IT+sa/0rQ= X-Received: by 2002:a17:906:cf88:b0:a45:373:cff with SMTP id um8-20020a170906cf8800b00a4503730cffmr10220392ejb.68.1709834705074; Thu, 07 Mar 2024 10:05:05 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> In-Reply-To: From: Warner Losh Date: Thu, 7 Mar 2024 10:04:53 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: Gleb Smirnoff Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="00000000000038985e061315ea25" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TrHJf4fHBz4QbV --00000000000038985e061315ea25 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 7, 2024 at 9:58=E2=80=AFAM Gleb Smirnoff = wrote: > On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: > W> If we imported each of the versions (exclusive of the cherry-picks). i= n > W> order and > W> then merged, this would give us a better history. The commit messages = of > W> the old > W> versions could include the hash where it was committed to the tree's > main > W> branch. > W> This might be wise, since it would allow us to add these links in the > W> future if that > W> functionality is added to git (or someone cures me of my ignorance). I > W> think that > W> if these versions were trivial to get, we should do it. If they are a > W> hassle, then we > W> can forego them. The possible future benefit is speculative at best, s= o > if > W> there's > W> more than a tiny amount of hassle, we should skip doing each version. > > Well, if the upstream is a true git repo, then we don't need to care > about versions, we can take it with full history as 'subtree add'. > Then, replay our commits on top. The downside is that each file will > have two histories, and it would require some effort when you call > git log to get the correct one. The repo bloat will not be large as > the objects would be the same, it would be only extra commits metadatas. > It's for the downsides that we don't do this in the FreeBSD tree except for zfs. And even there it causes problems with bisecting. > This all will look like a small version of what we have at Netflix, > where we followed unofficial FreeBSD git repo and then switched to > the official one. In practice it seems to work well, although a > perfectionists would not like doubled commits deep in the past. > It also would bloat the cloned FreeBSD repo. We already have enough bloat there w/o unduly adding to it. > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. > I'd rather we just import the couple of versions we have in the tree. While the full history might theoretically be useful, I don't think it is warranted in this case. Warner --00000000000038985e061315ea25 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 7, 2024 at 9:58=E2=80=AFA= M Gleb Smirnoff <glebius@freebsd.= org> wrote:
On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote:
W> If we imported each of the versions (exclusive of the cherry-picks). = in
W> order and
W> then merged, this would give us a better history. The commit messages= of
W> the old
W> versions could include the hash where it was committed to the tree= 9;s main
W> branch.
W> This might be wise, since it would allow us to add these links in the=
W> future if that
W> functionality is added to git (or someone cures me of my ignorance). = I
W> think that
W> if these versions were trivial to get, we should do it. If they are a=
W> hassle, then we
W> can forego them. The possible future benefit is speculative at best, = so if
W> there's
W> more than a tiny amount of hassle, we should skip doing each version.=

Well, if the upstream is a true git repo, then we don't need to care about versions, we can take it with full history as 'subtree add'.<= br> Then, replay our commits on top. The downside is that each file will
have two histories, and it would require some effort when you call
git log to get the correct one. The repo bloat will not be large as
the objects would be the same, it would be only extra commits metadatas.

It's for the downsides that we don= 9;t do this in the FreeBSD tree except for
zfs. And even there it= causes problems with bisecting.
=C2=A0
This all will look like a small version of what we have at Netflix,
where we followed unofficial FreeBSD git repo and then switched to
the official one. In practice it seems to work well, although a
perfectionists would not like doubled commits deep in the past.

It also would bloat the cloned FreeBSD repo. We al= ready have
enough bloat there w/o unduly=C2=A0adding to it.
=
=C2=A0
Bjoern, can you please point me at upstream source of truth?
Is it a repo, or what is it.

I'd ra= ther we just import the couple of versions we have in the tree.
W= hile the full history might theoretically be useful, I don't think it
is warranted in this case.

Warner
--00000000000038985e061315ea25-- From nobody Thu Mar 7 18:07:52 2024 X-Original-To: freebsd-git@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 4TrHN46Ny0z5DXg8 for ; Thu, 7 Mar 2024 18:08:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrHN44MV7z4R6W for ; Thu, 7 Mar 2024 18:08:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a450bedffdfso171293766b.3 for ; Thu, 07 Mar 2024 10:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709834883; x=1710439683; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=EsUoL+PKoRodbhcZtMQotPgvT5qiLehcmxSZX76pVi0=; b=h+f9Aflu2Wz0hw85xcDl5JYH3wq0zpZopvjnL4c78mHkEJGSZ3Tdjmpg0aRcLZYlz8 EDscMOIWEgDaFY6J179W/y3rQkwshMR0ZR7UGYxfUZ+noxvfR4JEUMAycPyKP8yiGMTS PCFBTV1MKwE0nTJ0UIJm1AXNUYrS7RdV6pzqGS4LLRjcM12UTY9FVgZdYZiiAIbAP4ZL pv7pf+TCAfYA8H+0B82DNK0NvsD9ncKUi7yBGRqxs5j3klDc9358/jznQF4M89Fc1Bmx vdJEGSAZ1lwuBKgilaUfOMo5g8f+jJzQdIbj/tghJdRcsavRa8N3zXyPrN5wePtKAfGj 7PwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709834883; x=1710439683; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EsUoL+PKoRodbhcZtMQotPgvT5qiLehcmxSZX76pVi0=; b=G6WonCdZaBwEKJjettYA0MEwsUqvxSyeIuo6l/1PJV48DMx5wZ45O/RuLuFPmcPxp6 LAeKzB/dr8qGqyDYzYWWCSU5g10CbIYs7wuVyqBm7ymg4QkCE5gPobXXKSw/y61PRe4a oOkigFP50yIpm+CE2262+aJEc8EXdHciAUsSmjL3/nKO/H7SF/juxzC60fdsrnftd8nl BJywZIEEyxN0Y2WicCZ/cRr46DfjbZeRVu7PopTTiKhjAc1OCL36GlkLQNM4NmD+BUME C38NmDzHxo5nVbMWvUxAZ4HsPPNSEMgpvc9oCB8Fv2aOqiH3UYKy5wmJSUl6RNEOMO7P r/Ow== X-Forwarded-Encrypted: i=1; AJvYcCWLYHt9UHWAw5z9q5yUjp1VBT07yiX4MYbOIJcJQH288PqMO/0IsZf3B3Z2rOYBeQJaW/e8q6AM4tUOyVfkofplI599ktIGHQ== X-Gm-Message-State: AOJu0YzBXQBhkX/zAx8RARbZHAQd/IsAKb98VFA1/5MzCWgbhwv+rm63 5sFpkHAnHqbJSaBKQGx16E2ShAxO8M66Z6L30XJhm05/Qt5nLLjm8iLr/vdh1/8GBWlLGWmJGmX mpFdm8Av8ywmTkn3votyUpOv/+U0jVLHnmxLxpgE+GPSeYde7XBA= X-Google-Smtp-Source: AGHT+IHMwnfRhUYnE2EJkDfahsn3IA2T7zJttshCFVzskG/5uj5ty/1Sb9eSIQEA4ANQ/ZQTe/0utV8wT6OF08Jo3vY= X-Received: by 2002:a17:906:5585:b0:a45:25d:a291 with SMTP id y5-20020a170906558500b00a45025da291mr9699397ejp.25.1709834882874; Thu, 07 Mar 2024 10:08:02 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> In-Reply-To: <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> From: Warner Losh Date: Thu, 7 Mar 2024 10:07:52 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: Gleb Smirnoff , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d19a65061315f483" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TrHN44MV7z4R6W --000000000000d19a65061315f483 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 7, 2024 at 10:04=E2=80=AFAM Bjoern A. Zeeb wro= te: > On Thu, 7 Mar 2024, Gleb Smirnoff wrote: > > > On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: > > W> If we imported each of the versions (exclusive of the cherry-picks). > in > > W> order and > > W> then merged, this would give us a better history. The commit message= s > of > > W> the old > > W> versions could include the hash where it was committed to the tree's > main > > W> branch. > > W> This might be wise, since it would allow us to add these links in th= e > > W> future if that > > W> functionality is added to git (or someone cures me of my ignorance).= I > > W> think that > > W> if these versions were trivial to get, we should do it. If they are = a > > W> hassle, then we > > W> can forego them. The possible future benefit is speculative at best, > so if > > W> there's > > W> more than a tiny amount of hassle, we should skip doing each version= . > > > > Well, if the upstream is a true git repo, then we don't need to care > > about versions, we can take it with full history as 'subtree add'. > > Then, replay our commits on top. The downside is that each file will > > have two histories, and it would require some effort when you call > > git log to get the correct one. The repo bloat will not be large as > > the objects would be the same, it would be only extra commits metadatas= . > > > > This all will look like a small version of what we have at Netflix, > > where we followed unofficial FreeBSD git repo and then switched to > > the official one. In practice it seems to work well, although a > > perfectionists would not like doubled commits deep in the past. > > > > Bjoern, can you please point me at upstream source of truth? > > Is it a repo, or what is it. > > yes, it's three or four or five different repos with the full linux > kernel in it; nothing you want. And I believe we do not do subtrees > in FreeBSD official. > If it is from the Linux Kernel, then I'd just need a directory list and a hash. And we definitely can't do a subtree merge from that repo to ours including its entire history. > I'll go and prepare the different versions locally the next days for > each driver and then we can see. > I think I just need a list of hashes and directories. I can bring it into a test vendor branch I can push to my personal github so everyone can take a look before we do the merge and make it permanent. Warner --000000000000d19a65061315f483 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 7, 2024 at 10:04=E2=80=AF= AM Bjoern A. Zeeb <bz@freebsd.org&= gt; wrote:
On Th= u, 7 Mar 2024, Gleb Smirnoff wrote:

> On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote:
> W> If we imported each of the versions (exclusive of the cherry-pic= ks). in
> W> order and
> W> then merged, this would give us a better history. The commit mes= sages of
> W> the old
> W> versions could include the hash where it was committed to the tr= ee's main
> W> branch.
> W> This might be wise, since it would allow us to add these links i= n the
> W> future if that
> W> functionality is added to git (or someone cures me of my ignoran= ce). I
> W> think that
> W> if these versions were trivial to get, we should do it. If they = are a
> W> hassle, then we
> W> can forego them. The possible future benefit is speculative at b= est, so if
> W> there's
> W> more than a tiny amount of hassle, we should skip doing each ver= sion.
>
> Well, if the upstream is a true git repo, then we don't need to ca= re
> about versions, we can take it with full history as 'subtree add&#= 39;.
> Then, replay our commits on top. The downside is that each file will > have two histories, and it would require some effort when you call
> git log to get the correct one. The repo bloat will not be large as > the objects would be the same, it would be only extra commits metadata= s.
>
> This all will look like a small version of what we have at Netflix, > where we followed unofficial FreeBSD git repo and then switched to
> the official one. In practice it seems to work well, although a
> perfectionists would not like doubled commits deep in the past.
>
> Bjoern, can you please point me at upstream source of truth?
> Is it a repo, or what is it.

yes, it's three or four or five different repos with the full linux
kernel in it; nothing you want.=C2=A0 And I believe we do not do subtrees in FreeBSD official.

If it is from the = Linux Kernel, then I'd just need a directory list and a hash.

And we definitely can't do a subtree merge from that re= po to ours including
its entire history.=C2=A0
=C2=A0
I'll go and prepare the different versions locally the next days for each driver and then we can see.

I thin= k I just need a list of hashes and directories. I can bring it into a
=
test vendor branch I can push to my personal github so everyone can
take a look before we do the merge and make it permanent.

Warner
--000000000000d19a65061315f483-- From nobody Thu Mar 7 18:15:46 2024 X-Original-To: freebsd-git@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 4TrHY06wYGz5DYHP for ; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@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 4TrHY0627Vz4SP2; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709835348; 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=Y69TK9a/L/G4WFyK0kRAR1RrD6a34KXnDaM/wtwioHY=; b=mOXbE1R14v/7GP/k/8T+/M/K4hHs1BXtpvZWUGXDkotssEBGBMPdeJXYuKBvYiMZ9xlWNI qkV5ZXaitLvY26Y0NrY1spyEY8AkbB7iFE66TDoh/40W+77yrW1OfuBhtRBDQw5bv+iqbJ 6eImIvD4mt8SUZFw8NSxUT1TLismtsq1ARaxCnr7WL/2pPL7Bfhuh5QvQvXE+mJa1x8zZj +llW4JjzbA4THRIqwBLGWjeMplw6A6WldUuT3qlrx8T6jSkOhs2buYz0yJNxNorxzvHGkK ieD6hQ2efJtgGJ1vAgf6p0tAYLlCY21pTAaRoh0O/tTvX/FjtHUJMS9zZ70Q5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709835348; a=rsa-sha256; cv=none; b=pHVWt/WHXXlTDJSMF6jJD7S/C7i9phXYdN/R4hxUlg+f31l+6YQJWVVlxYnEOYeuOAtuue nBJIs/RdtbJ6b21PI07pzQz6iJofWv9zRcM8axUM5oU+yvJHjZX0RvPcoJuvWj7ZcjflnM I0UVNqzWZPvq2yK3h+GnhPpFn/cm4Lfdaegtx9JTP5vWvD6QCErfBPj4cTnbbdXoZURrxh 5UjMLI4EVdiwsmuL0TaiPu0Ij4r4UtVtMr6I8v1S7UL9raQkMTzkUv10oMqp2r+tCEd9NY kvw4Zh1amHQmrRlUEFJCxhaU8Q+wKV+7lfd6hmhOyLBjbHLdHkT4DwZ/dceSbw== 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=1709835348; 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=Y69TK9a/L/G4WFyK0kRAR1RrD6a34KXnDaM/wtwioHY=; b=K/VHqXiKGtJIwMYZDUDGmlsGmBUvlvV5IhaYQvH4v1bq6oGq6Lbt0PpoqLWTr9/z9oOvQq 7TgNvaDVZ7KJFg6E2TtCKDmOZ1EbSOGd3QCy5Jh5sxyiZx/QT1XFvsChGJifv2NkaNexvU CnUIU7JKmXB8Mlsedoq3KaLmxKHtk+yVq5FY61gZRylqIAHotBkAAhdz38Cbc5KvA0v9Up ST3Wbdc+71n40eJMJ647oouxfGB5u2c0kQ4Ef8DRouxqALczl3MrA0cFVh5CMIrJ4/vi6J IPId1WiEGaiHys9VBuFYTu77gQ0SZI7xnB6zTeqdopqSRRxZVo1vNeH7R0LczQ== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrHY02FHkz1BvH; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 7 Mar 2024 10:15:46 -0800 From: Gleb Smirnoff To: Warner Losh Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, Mar 07, 2024 at 10:07:52AM -0800, Warner Losh wrote: W> > yes, it's three or four or five different repos with the full linux W> > kernel in it; nothing you want. And I believe we do not do subtrees W> > in FreeBSD official. W> > W> W> If it is from the Linux Kernel, then I'd just need a directory list and a W> hash. W> W> And we definitely can't do a subtree merge from that repo to ours including W> its entire history. Well, we can do 'subtree split' out of the Linux and then 'subtree add' to us to seed it with full history. After that, for the updates we would do incremental 'subtree split' followed by 'subtree merge'. This all is doable if we really want to. It is up to you if we want to do that or not. -- Gleb Smirnoff From nobody Thu Mar 7 18:17:13 2024 X-Original-To: freebsd-git@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 4TrHZh5K2Hz5DYKt for ; Thu, 7 Mar 2024 18:17:16 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4TrHZh4nbdz4SGC; Thu, 7 Mar 2024 18:17:16 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709835436; 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=CrCqaLsTmoKn7i2mKWCuiMCF+ZsVVceGRebztEvNI6Y=; b=cO6Smtk7DbGnH01G2h5emiajqJasLi1R80d7DnMuy2jA1TbT2N3ebPrH/Qg4qvQFmQKyat zESCxB2/EzRadyJe/LNw02IgRw0rTWb6gB3b0P+aAVBwIg+TPDlaI+mvJy/SK+yWEdnix4 Kz2pX2nPmSx5IAU7W8grARkV1prQWF7jclh4+/rHhcP0A1v8RQutpC1iKAOBU2KCzd5M9u vo6LVES78P8muDldjzjqcWFunqQAqCtZQXqokY1WZx2wtT0FAZN0JWhxU41XEfBUptZ7W2 BV3NzJwLHn4HqeNqnQ1sXonxcnHaamyqSxC90KD/B2P35P/Y3q490h7atCiYJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709835436; a=rsa-sha256; cv=none; b=odu/4EvMQ3Hs+7/nSXXpCdMZFCK5SvQu6A9TVNZyu/VMNjREpwtZ/wd3p7th9JdJV7UAiQ gpA1CSgSSoE9bThLNsDz+5SWCt5rKagoIyQqZ6J8JeDhGtvHaaKBqqJS9jxz6JXcfQgkFG l8/x1yCtSDt7qu7LQLg2SZLKkyg0qoKY9racRREuiP6yT5DFSqR9k0sfhT5Ub7BkWLwHtw mUfbg8akPQyt57xDY5wcbxYKb5ng/aI+2RetmGyXgwJ/mLnqSicChi5cqEN4Y8+l9gdWa2 6VmUgujlGFfoR8l6Q82Lqj+AOk+nATlORrPTrc/YTnQaXR2LAjoN26T8JXNT+A== 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=1709835436; 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=CrCqaLsTmoKn7i2mKWCuiMCF+ZsVVceGRebztEvNI6Y=; b=ITkmmWKm90sBeK/SEFKdRAjN6kxS+iWVlQmp12/ZD0ubqBkaAvyLpnlNT9wgdDirSbhbQN tOfwtiqrTkO0KB7NPo5BE0Arr6Kz6HOnE64upJnMe0+L/oDQsv2SxtLhgKNlN7knVNIW/K 83QgTLDHc+aCWm0/KoAyxWBLBQIk1E9NTGET78ZsaH/iuDxd/qB2ytyFGWikcZghHewsnc qgpHeyvGBoCoeBekoT20bD26wwt6WtZ1tNfIGplEnCBlfDAACSzAZbWxzstP43HOoGl2fC 79ou6JIE7QAk8QEL3gGGVZxdZCDcX6DVMsK9ukQphnv9fiecYPtigsWk536NUA== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrHZh3mc1z19qC; Thu, 7 Mar 2024 18:17:16 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 4104C8D4A214; Thu, 7 Mar 2024 18:17:15 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 7F2A82D029D2; Thu, 7 Mar 2024 18:17:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id VTuOmqBKmLXU; Thu, 7 Mar 2024 18:17:13 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 5AB582D029D8; Thu, 7 Mar 2024 18:17:13 +0000 (UTC) Date: Thu, 7 Mar 2024 18:17:13 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? In-Reply-To: Message-ID: <49op09r9-p95s-0o63-42n4-noo04o4n4q9q@serrofq.bet> References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-1802363252-1709835433=:2366" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1802363252-1709835433=:2366 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Thu, 7 Mar 2024, Warner Losh wrote: > On Thu, Mar 7, 2024 at 10:04 AM Bjoern A. Zeeb wrote: > >> On Thu, 7 Mar 2024, Gleb Smirnoff wrote: >> >>> On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: >>> W> If we imported each of the versions (exclusive of the cherry-picks). >> in >>> W> order and >>> W> then merged, this would give us a better history. The commit messages >> of >>> W> the old >>> W> versions could include the hash where it was committed to the tree's >> main >>> W> branch. >>> W> This might be wise, since it would allow us to add these links in the >>> W> future if that >>> W> functionality is added to git (or someone cures me of my ignorance). I >>> W> think that >>> W> if these versions were trivial to get, we should do it. If they are a >>> W> hassle, then we >>> W> can forego them. The possible future benefit is speculative at best, >> so if >>> W> there's >>> W> more than a tiny amount of hassle, we should skip doing each version. >>> >>> Well, if the upstream is a true git repo, then we don't need to care >>> about versions, we can take it with full history as 'subtree add'. >>> Then, replay our commits on top. The downside is that each file will >>> have two histories, and it would require some effort when you call >>> git log to get the correct one. The repo bloat will not be large as >>> the objects would be the same, it would be only extra commits metadatas. >>> >>> This all will look like a small version of what we have at Netflix, >>> where we followed unofficial FreeBSD git repo and then switched to >>> the official one. In practice it seems to work well, although a >>> perfectionists would not like doubled commits deep in the past. >>> >>> Bjoern, can you please point me at upstream source of truth? >>> Is it a repo, or what is it. >> >> yes, it's three or four or five different repos with the full linux >> kernel in it; nothing you want. And I believe we do not do subtrees >> in FreeBSD official. >> > > If it is from the Linux Kernel, then I'd just need a directory list and a > hash. > > And we definitely can't do a subtree merge from that repo to ours including > its entire history. > > >> I'll go and prepare the different versions locally the next days for >> each driver and then we can see. >> > > I think I just need a list of hashes and directories. I can bring it into a > test vendor branch I can push to my personal github so everyone can > take a look before we do the merge and make it permanent. it's never quite that simple ;-) You'd need to filter out the GPL files which never saw light in FreeBSD and we did not import all subdirectories of all drivers. Apart from that the different repo names and hashes would be in the commit messages. Let me do the proper due diligens. I'll prepare them for you; will save you enough time. I am greatful enough that you are helping to sort all this out. /bz -- Bjoern A. Zeeb r15:7 --1098556516-1802363252-1709835433=:2366--