<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Jul 24, 2021, 11:30 AM Christian Mauderer <<a href="mailto:oss@c-mauderer.de">oss@c-mauderer.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hello Joel,<br>
<br>
On 24/07/2021 18:18, Joel Sherrill wrote:<br>
> <br>
> <br>
> On Sat, Jul 24, 2021, 10:19 AM Christian Mauderer <<a href="mailto:oss@c-mauderer.de" target="_blank" rel="noreferrer">oss@c-mauderer.de</a> <br>
> <mailto:<a href="mailto:oss@c-mauderer.de" target="_blank" rel="noreferrer">oss@c-mauderer.de</a>>> wrote:<br>
> <br>
> Hello,<br>
> <br>
> in a discussion with Husni I noted that the patches adding ttcp are<br>
> only<br>
> on the 6-freebsd-12 branch of libbsd. Is there a reason that they are<br>
> not on master too?<br>
> <br>
> <br>
> Yes but forgetting isn't a good reason. I know I have a recent patch so <br>
> apps using C99 or C++03 can compile using libbsd missing also. I will <br>
> survey OAR and make sure we catch up.<br>
<br>
I missed something like that in the past too and I will miss it in the <br>
future. And I'm sure that I have some on master that are not on <br>
6-freebsd-12. So no problem. Just wanted to check that there is no other <br>
reason.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">We probably need to collectively be more diligent about asking that any patches go onto 6-freedbsd-12 and master. Some also should go to 5-freebsd-12. We are all busy and just forget.</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
By the way: Please tell me if you find patches that I missed ;-)<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">I would if we can figure.out how to spot them.</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
> <br>
> Is there any reason rtemsbsd/ just shouldn't be the same?<br>
> <br>
<br>
Most of it most likely is the same. But there are differences. Some of <br>
them might shouldn't be there but they are there. Try to checkout master <br>
and do a<br>
<br>
git diff 6-freebsd-12 -- rtemsbsd/<br>
<br>
I don't think that someone wants to clean that up on an update.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Is it possible to take the output of that and do a git blame on the 6-freebsd-12 branch, grab the hash and author, and generate a master list of hashes and who was responsible for review?</div><div dir="auto"><br></div><div dir="auto">It would make the audit easier.</div><div dir="auto"><br></div><div dir="auto">Changes to the FreeBSD directory might be harder. I know Kinsey back ported some stuff. </div><div dir="auto"><br></div><div dir="auto">--joel</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Best regards<br>
<br>
Christian<br>
<br>
> <br>
> <br>
> <a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4</a><br>
> <<a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4</a>><br>
> <a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633</a><br>
> <<a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633</a>><br>
> <a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d</a><br>
> <<a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d</a>><br>
> <a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb</a><br>
> <<a href="https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb" rel="noreferrer noreferrer" target="_blank">https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb</a>><br>
> <br>
> Background for the question: I expect that an update to FreeBSD 13 will<br>
> use only what is on the master branch. That's basically what master is<br>
> for: Tracking the development to keep up with new stuff in FreeBSD and<br>
> make it easy to jump to the next FreeBSD release. In other words: I<br>
> think a (possible future) 6-freebsd-13 branch will be based on master<br>
> and not on 6-freebsd-12. Am I wrong with that assumption?<br>
> <br>
> Again: please correct me if I'm wrong but with that in mind I would say<br>
> that it is a good idea to port to master and 6-freebsd-12 or (for<br>
> experimental stuff) only to master. But not only to 6-freebsd-12.<br>
> <br>
> Best regards<br>
> <br>
> Christian<br>
> <br>
</blockquote></div></div></div>