From nobody Thu Dec 28 03:42:37 2023 X-Original-To: dev-commits-src-main@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 4T0vTn6phNz555wf; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T0vTn6NDLz4JWs; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703734957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nrJ7IplH4fAZ8DH9tkjPpD9oh5+r+mYVVfULmrSowA=; b=ZKrfsA+0R1Agf804Oevtd2tEyfiGXVLy/qO/5ngY3elAy2FtukVJV7/SISQkN6ce6MaprU 6tdBjgxE6fe+PSOgKdvz1dQg02HIX7FDY/KgUDQdbsHz2L53IR+O8V44dVuG3p/WDSaNyl HeqST8bLs+u02SAZLFJvmrxyFNECd6JaNMtPTZCfWTfJtej6P9XHUrEaKNHKKxMgAEBH00 oPt6yiG1Li1xneV6f+4/i3VAo7/IL69SUqihbWHINJ5rrwdFel46Q16VjMo1nJ+wHvsrpi kRcQwDnnuSrrrAK7addGj0+ilsSVkqEzlKEODF1ui34P8gSgpihuE+rqPMVVfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703734957; a=rsa-sha256; cv=none; b=TFhQZNzRGHHzN8rRUvV2wjJ+eqmrUsjaEr7Q4t1dF5QP1h1SEsT1t1VnwDGQ5cT1XxRrhv z7/HXN7/vzo9ETKq5dlOEQFStsyty53Hj+V/G9fvU1QTIv4jylGxbA1gHodnFoaow9vVVO 0xbFHe9btAVUEXav+aVVCsscRquIcADP5/i2+XlEd3GUemdu+2unhvFZ0QKzaZMpvr7YjP rtxIbagiIygvlB5g6ZfoGYk8Vvu32w67sLVNRina+1tCystrU2rLiR/Ibx6puMHPjLkBIc wlHODeA/aXSE2Lmcwt7eAROfX+AAOgS2blzLSBiHjwNfPW125Hgbm33ZpcCTuQ== 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=1703734957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nrJ7IplH4fAZ8DH9tkjPpD9oh5+r+mYVVfULmrSowA=; b=eFJSikZ38ssszG6Eq1zdhdSks1THouG2raoXZOm7zwv+oZhFe0xCsLOwm6ppx5TJ9Dn+k1 +6y86YyTPiA+wOR7sx0MBDEwdGldqNorK/0QkeYSFHfDy37868W8WNXnDOjv9/mm6jmnPy awRoIwSH9yx0Cq6gW7ek0QKJx7IW4MTYjqRE+WI982A8LPDvKU5P9zyIosFecgQrEZGkGc DpyFpdgzth9MVFUXePNzDdJsrTMkJ0avte+GiivbpJMhnh3f57eo29vcW4p94TRMIYdxDK Yf6yObHo/BeyKXnukYLOYC6E/6nOceumv/lDMSdXMRBDJnJe2S+bPnGLqDLShg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T0vTn5RyQz15bs; Thu, 28 Dec 2023 03:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS3gbNF011455; Thu, 28 Dec 2023 03:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS3gb5Z011452; Thu, 28 Dec 2023 03:42:37 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:42:37 GMT Message-Id: <202312280342.3BS3gb5Z011452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 05e5852d1bba - main - CONTRIBUTING.md: add note about upstreams. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05e5852d1bbadaecae222415a3c68f17ab2d0b93 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05e5852d1bbadaecae222415a3c68f17ab2d0b93 commit 05e5852d1bbadaecae222415a3c68f17ab2d0b93 Author: Warner Losh AuthorDate: 2023-12-28 03:40:57 +0000 Commit: Warner Losh CommitDate: 2023-12-28 03:40:57 +0000 CONTRIBUTING.md: add note about upstreams. Sponsored by: Netflix --- CONTRIBUTING.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9f965ed9e3ff..31ca40700b76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,3 +142,15 @@ as part of their class work, please contact imp@FreeBSD.org before the semester to ensure we allocate the proper resources to process them quickly. We'll give you more details when you contact us and thanks for including FreeBSD in your class work. It also helps us keep track. + +## FreeBSD's Upstreams + +Anything that's in the directory `contrib`, `crypto`, `sys/contrib` or +`sys/cddl` likely has an upstream we pull from. Please do a git log --merges in +any subdirectory of these you are submitting patches for to find out the last +time we merged from upstream. If it is in the last 5 years, upstream is "active" +and you should submit your patches there and let the last few people to commit +to this file (especailly merge commits) know. If it's been more than 5 years, +upstreamm is likely inactive so please submit the patch. We can sort out if it +should go into FreeBSD or upstream. +