Re: ttcp only on 6-freebsd-12 and not on master of libbsd

[Kinsey Moore]

Christian's handy script correctly identified that the CGEM patches for 
ZynqMP (and all related changes) have not gone into rtems-libbsd master. 
This is due to those initial patches being primarily a backport of 
existing FreeBSD 13 patches with some modifications that rendered them 
very unlike the original patches that went into FreeBSD 13. We had 
decided to hold off on merging the CGEM patches to master and I think it 
was pending the NFSv4 work that Chris is doing. Most of the attendant 
patches to that work can be cherry-picked in with little to no effort, 
but the core patch is going to require a rewrite since much of what it 
required is already present in FreeBSD 13.
Kinsey

On 7/24/2021 15:11, Christian Mauderer wrote:
Hello Joel,

On 24/07/2021 22:02, Joel Sherrill wrote:

On Sat, Jul 24, 2021, 1:55 PM Christian Mauderer <o...@c-mauderer.de 
<mailto:o...@c-mauderer.de>> wrote:
    Hello Joel,

    I wrote a short script to find different commits based on author and
    subject (see attached python-script). It seems that there are quite
    some
    differences (see attached output).


Quick work!

Yes, a quick and _dirty_ hacked together script ;-)

Most likely that script is not fit for inclusion into our repos. It's 
python3, it's using an external lib and I haven't take care that it 
matches a coding style. The last one is a small problem.
    The big blog of HDMI on Beagle patches that is only on master is 
caused
    by me. These have been developed by Vijay while I was a mentor 
for his
    project. Would be a question whether that's a feature that should 
be on
    the stable branch too or not. Some commits will be most likely 
only on
    one branch (for example 816a2f912f where Chris updated rtems_waf).


Anything 5 is stable. I would personally say it's ok to merge Vijay's 
work to 6-freebsd-12.
Sorry, I used the wrong term: For me the *-freebsd-12 is something 
that I would recommend for projects that want something solid. So I 
would also see 6-freebsd-12 as a mostly stable version (also it's 
under active development).
The biggest consideration for me is not negatively impacting Chris 
sorting out merging NFSv4 and all that comes along with that. But 
this should be independent.
Good point. Maybe we should wait a bit. I think cherry-picking patches 
between the branches can be done after that too.
Best regards

Christian

--joel


    Best regards

    Christian

    On 24/07/2021 18:40, Joel Sherrill wrote:
     >
     >
     > On Sat, Jul 24, 2021, 11:30 AM Christian Mauderer
    <o...@c-mauderer.de <mailto:o...@c-mauderer.de>
     > <mailto:o...@c-mauderer.de <mailto:o...@c-mauderer.de>>> wrote:
     >
     >     Hello Joel,
     >
     >     On 24/07/2021 18:18, Joel Sherrill wrote:
     >      >
     >      >
     >      > On Sat, Jul 24, 2021, 10:19 AM Christian Mauderer
     >     <o...@c-mauderer.de <mailto:o...@c-mauderer.de>
    <mailto:o...@c-mauderer.de <mailto:o...@c-mauderer.de>>
     >      > <mailto:o...@c-mauderer.de <mailto:o...@c-mauderer.de>
    <mailto:o...@c-mauderer.de <mailto:o...@c-mauderer.de>>>> wrote:
     >      >
     >      >     Hello,
     >      >
     >      >     in a discussion with Husni I noted that the patches 
adding
     >     ttcp are
     >      >     only
     >      >     on the 6-freebsd-12 branch of libbsd. Is there a
    reason that
     >     they are
     >      >     not on master too?
     >      >
     >      >
     >      > Yes but forgetting isn't a good reason. I know I have a 
recent
     >     patch so
     >      > apps using C99 or C++03 can compile using libbsd missing
    also. I
     >     will
     >      > survey OAR and make sure we catch up.
     >
     >     I missed something like that in the past too and I will miss
    it in the
     >     future. And I'm sure that I have some on master that are 
not on
     >     6-freebsd-12. So no problem. Just wanted to check that there
    is no
     >     other
     >     reason.
     >
     >
     > 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.
     >
     >
     >     By the way: Please tell me if you find patches that I 
missed ;-)
     >
     >
     > I would if we can figure.out how to spot them.
     >
     >
     >      >
     >      > Is there any reason rtemsbsd/ just shouldn't be the same?
     >      >
     >
     >     Most of it most likely is the same. But there are
    differences. Some of
     >     them might shouldn't be there but they are there. Try to 
checkout
     >     master
     >     and do a
     >
     >          git diff 6-freebsd-12 -- rtemsbsd/
     >
     >     I don't think that someone wants to clean that up on an 
update.
     >
     >
     > 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?
     >
     > It would make the audit easier.
     >
     > Changes to the FreeBSD directory might be harder. I know 
Kinsey back
     > ported some stuff.
     >
     > --joel
     >
     >
     >     Best regards
     >
     >     Christian
     >
     >      >
     >      >
     >      >
     >
https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4>
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4>> 

     >      >
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4> 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=af06b267c5ce04e8a4a7719cb0c723ee4a27f4b4>>> 

     >      >
     >
https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633>
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633>> 

     >      >
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633> 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=7960ab7a43d5a7c6ceccdd67f8e379adfce7a633>>> 

     >      >
     >
https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d>
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d>> 

     >      >
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d> 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=6cc63cbe657c3ee664727cce1a54acc7e7b5fe9d>>> 

     >      >
     >
https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb>
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb>> 

     >      >
     > 
 <https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb> 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb 
<https://git.rtems.org/rtems-libbsd/commit/?h=6-freebsd-12&id=8dfea31d729fafab69b5cf1846598f5104b0faeb>>> 

     >      >
     >      >     Background for the question: I expect that an 
update to
     >     FreeBSD 13 will
     >      >     use only what is on the master branch. That's
    basically what
     >     master is
     >      >     for: Tracking the development to keep up with new 
stuff in
     >     FreeBSD and
     >      >     make it easy to jump to the next FreeBSD release. 
In other
     >     words: I
     >      >     think a (possible future) 6-freebsd-13 branch will be
    based
     >     on master
     >      >     and not on 6-freebsd-12. Am I wrong with that 
assumption?
     >      >
     >      >     Again: please correct me if I'm wrong but with that in
    mind I
     >     would say
     >      >     that it is a good idea to port to master and
    6-freebsd-12 or (for
     >      >     experimental stuff) only to master. But not only to
    6-freebsd-12.
     >      >
     >      >     Best regards
     >      >
     >      >     Christian
     >      >
     >

_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel