From owner-freebsd-hackers@freebsd.org Thu Dec 10 10:45:41 2020 Return-Path: Delivered-To: freebsd-hackers@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93B0747CC12 for ; Thu, 10 Dec 2020 10:45:41 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cs9Yc15vbz3lKQ for ; Thu, 10 Dec 2020 10:45:39 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1607597136; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LpTVjaTF1g9pNlMOu6Mh/9HD3n9Qvn2MN32PWT0BRLA=; b=bAv5Bjckrot/aXkUC9hDLkpSpKPL5MZwm/+6GdX+E9+hoM1O67AfSkitpWYbrzbMDYtX/h gA+BL71qq85CAdW3H5ZZhkWgSUkPo2kp6DOAZQpcyiq4kINCzf5wjvnDo+IJ2FF+HLoDnp 9YMDYcc52FAd4Y1+B0dOcdS5fPZ+ouk= Received: from amy.home (lfbn-idf2-1-288-247.w82-123.abo.wanadoo.fr [82.123.126.247]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 01b43ce1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 10 Dec 2020 10:45:36 +0000 (UTC) Date: Thu, 10 Dec 2020 11:45:36 +0100 From: Emmanuel Vadot To: Warner Losh Cc: FreeBSD Hackers Subject: Re: Vendor Imports in Subversion Message-Id: <20201210114536.486bb5d64fd3e727d94b271f@bidouilliste.com> In-Reply-To: References: <20201209135432.d6615ff4f040e1b53e4a5351@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Cs9Yc15vbz3lKQ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=bAv5Bjck; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+mx]; ARC_NA(0.00)[]; SPAMHAUS_ZRD(0.00)[212.83.155.74:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[212.83.155.74:from]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-hackers] X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 10:45:41 -0000 On Wed, 9 Dec 2020 17:25:48 -0700 Warner Losh wrote: > On Wed, Dec 9, 2020 at 5:54 AM Emmanuel Vadot wrote: > > > On Tue, 8 Dec 2020 23:47:18 -0700 > > Warner Losh wrote: > > > > > Greetings, > > > > > > The git working group is making final preparations for the cut over in > > two > > > weeks (currently planned to start December 19). There's one item that's > > > caused some recent problems that we'd like to ask the committer's help > > on: > > > vendor imports. We've had a few vendor imports of late that have caused > > > problems for the git converter. Imports should be done from the top level > > > so that the merge info winds up in the right place. uqs@ has added code > > to > > > defensive code to detect the recent problems, but we're not sure it will > > > catch everything. > > > > > > So, over the next two weeks, we'd like to ask that committers refrain > > from > > > doing vendor imports in the src tree for those cases where delay is > > > possible. For vendor imports that can't wait, due to security or other > > > serious issues, please coordinate with git@freebsd.org before doing the > > > vendor import. If there's a confidential matter, you can contact me ( > > > imp@freebsd.org) or the core team instead. > > > > > > Thanks for your understanding... > > > > > > Warner > > > On behalf of the git working group > > > > So, > > I wanted to import 5.9 and 5.10 dts before 13.0 and also before the > > switch to git to be sure that I did not screw things up. > > Also I don't see how vendor imports are supposed to work with git > > subtree, I admit that I have only a recent and limited experience with > > subtree. > > > OK. I'm nervous about this, but I know you've done them in the past. When > is 5.10 supposed to be golden so we can import it? 5.10 is at -rc7 right now so I guess in a week or two it will be released. > > > The other problem is that for dts we import everything from > > upstream but only merge part of it (include, arm, arm64 and riscv > > directory), is that supported ? > > More generaly is there a write up on how to use subtree for vendor > > import already written ? > > > > I'm working on that writeup. I believe it is possible, but I've not yet > come to that part of the write up. Ok, please let me know when you have at least something written for generic vendor import with subtree, I can do test then. > Warner > _______________________________________________ > freebsd-hackers@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-hackers > To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org" -- Emmanuel Vadot