From nobody Wed Mar 06 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--