From 05e5852d1bbadaecae222415a3c68f17ab2d0b93 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 27 Dec 2023 20:40:57 -0700 Subject: [PATCH] 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. +