[PATCH v1 0/6] [libbsd] Fix e1000 driver for i386 in master and 5

[Sebastian Huber]

On 11/09/2020 07:38, Chris Johns wrote:

> On 10/9/20 9:34 pm, Sebastian Huber wrote:
>> On 10/09/2020 12:13, Sebastian Huber wrote:
>>> On 09/09/2020 17:28, Gedare Bloom wrote:
>>>>>>> I am not sure if the 5 branch in the rtems-libbsd.git repo is right and if it
>>>>>>> should be made from the 5-freebsd-12 branch? I feel it is currently confusing
>>>>>>> but either way it has issues.
>>>>>>>
>>>>>> Maybe, we can continue to discuss that outside of this patch set? Renaming
>>>>>> a branch later should be no trouble.
>>>>>> An option could be to rename 5 -> 5-freebsd-master, then the mapping
>>>>>> between rtems and FreeBSD would always be explicit.
>>>>> Yes this is one Joel mentioned the other day and I missed the context in
>>>>> relation to these patches. I think moving 5 to 5-freebsd-master makes sense.
>>>>> What we have is confusing.
>>>>>
>>>> +1
>>>>
>>>> Would be good to get Christian or Sebastian to comment/agree :)
>>>>
>>> Yes, the branch name "5" makes no sense. It should be "5-freebsd-master".
>> Actually, I think we should delete this branch or is there someone willing to
>> maintain it?
> If that is the case why have 5-freebsd-12? Why not make it 5 and then all the
> repos are the same?
Ok, this is also an option. Delete the 5 branch and then rename 
5-freebsd-12 to 5.
>
>> The libbsd branch recommended for RTEMS 5 is 5-freebsd-12.
> Do we maintain FreeBSD related fixes off the freebsd-12 release branch only?
 From my point of view yes. This branch was used for the 5.1 release 
archive and it should be also used for the 5.2 release archive.