[throw0101d]

> But I suppose maybe some of their less sensitive changes, if upstreamed, relieves them of having to own them.

General best practice is to (a) upstream as much as you can, and (b) keep as close to -HEAD (the development branch) as possible. Some discussion on this at the Vendor Conference from a few months ago:

* https://freebsdfoundation.org/news-and-events/event-calendar...

* https://www.youtube.com/playlist?list=PLugwS7L7NMXzSalaF4l_7...

Basically: if it's not part of your secret sauce, upstream it.

[craftkiller]

In addition to the vendor summit, Netflix gave a tech talk recently where they recommended both upstreaming and keeping as close to -CURRENT as possible

"Why we run FreeBSD CURRENT at Netflix": https://www.youtube.com/watch?v=q4TZxj-Dq7s