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