From owner-freebsd-hackers@freebsd.org Thu Dec 10 00:26:02 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 281BA4B64AA for ; Thu, 10 Dec 2020 00:26:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Crvpd0q8jz4cwV for ; Thu, 10 Dec 2020 00:26:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x730.google.com with SMTP id 19so3259433qkm.8 for ; Wed, 09 Dec 2020 16:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TitmIsEAAgppVrlxN6sSJVIVlxDVgJ22xeco7gt5KZI=; b=UCNHOfowj9H+5T4RN7cHbJHtM/MmUbxvCttvThsVX/MGH45ee4LB4o+Sldl6x5Z68H sSHVPZcXv8ZfwavcBfii0BTDCvoMNtqgQOCzauGk8iSCvUwas3uqHAojJQzHSifKNnju on/dpSRlDnwbNJ1r3oeK5aTyl8IsP0CZXMhwy9xGVBDDq1J/x8pEtuBfgp9UORapbwkw HtmpcSxa5OK0s8zwwIKFLtQE7nhALKJR5Pv+eZmStdGOPmmn3xghtsxpnCoB4ma0Wib/ r69WjnS/TixqCTpo77hfQcglV/PrR6CdvDqbClFJt7DMmdCQvZNnOND9O99jWn+LC/U0 T0+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TitmIsEAAgppVrlxN6sSJVIVlxDVgJ22xeco7gt5KZI=; b=U/EhqkyY2LpLmgaRGjnDd5JDx3g3JN7/zgzYEEzaqSLESkfGUcFinypyiLDCLMMANy dGsKcB/g8cuUbjG5OKFcC43HDxK9j9G9D+neb09nzVbj97vlQJGAfPBPSVpVtEQZsVHV JhcghWQPf25txhRLWats33YuCzEl+1O7TyvajgHeUagQcslKYkeWHsIBUIFQ9eRQewYB R28Qmw9Jg8AUEbk+TGs9P0VxOSjuziPjja3EGkZPmcvmIRTpZINqQLPkTFnIgTG59+gU frmoZznRpVagA+IwjHLfiurPh33E+Dc8jX2oVirQfk8B9wUOrPtr9n6khb2e/YDnGknJ tOpw== X-Gm-Message-State: AOAM531Xwtx1RjDiP87/WRvunCzbJEPzIcjNVF1p0ZgbuU/h9WNVM6TI g/c2AV4wwTJoRd5acAW3PPyyKr/2raciG5vKhw5FF0wpAaKMWg== X-Google-Smtp-Source: ABdhPJxAZUvbHHXSL9rYBqpsTlUXbT0PPH7W99Kb2EIk9UX75bEGvSwDdt63SgelB/Pe6ioaCcf5NBdHzmkBFPQV2nY= X-Received: by 2002:ae9:ebd5:: with SMTP id b204mr5911964qkg.195.1607559959173; Wed, 09 Dec 2020 16:25:59 -0800 (PST) MIME-Version: 1.0 References: <20201209135432.d6615ff4f040e1b53e4a5351@bidouilliste.com> In-Reply-To: <20201209135432.d6615ff4f040e1b53e4a5351@bidouilliste.com> From: Warner Losh Date: Wed, 9 Dec 2020 17:25:48 -0700 Message-ID: Subject: Re: Vendor Imports in Subversion To: Emmanuel Vadot Cc: FreeBSD Hackers X-Rspamd-Queue-Id: 4Crvpd0q8jz4cwV X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=UCNHOfow; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::730) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::730:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::730:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::730:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-hackers]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 00:26:02 -0000 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? > 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. Warner