SDK/ethernet git repository branches

[Madalin-Cristian Bucur]

Here is a short description of the SDK/ethernet repository branches used for the DPAA
drivers and Gianfar Ethernet driver.

:: DPAA Upstreaming branches:

:. ldup
 - development branch for the DPAA upstreamable drivers (QBMan, FMan, dpaa_eth)
 - changes are staged here for submission to the upstream mailing list for review &
    acceptance
 - automated tests are run in 3 stages on this branch when new changes are pushed
 - periodically rebased over the latest vanilla Linux kernel tag

:. ldup-sdk
 - development branch for the DPAA upstreamable drivers second wave content
 - changes staged here will not be sent in the first patch set or are meant for long
    term integration of SDK code with upstreamable drivers
 - automated tests are run in 3 stages on this branch when new changes are pushed
 - periodically rebased over ldup; currently is left behind, working on getting back on
    top of ldup

:: DPAA SDK branches:

:. dpaa-next
 - default development branch for the SDK DPAA drivers
 - changes are staged here for inclusion in the SDK Linux kernel tree
 - automated tests are run in 3 stages on this branch when new changes are pushed
 - periodically rebased over the SDK Linux kernel tree

:: DPAA LS1043 support branches:

:. dpaa-arm-next
 - development branch for the LS1043 support in the dpaa_eth drivers
 - changes were staged here for inclusion in the LS1043 Linux kernel tree held by Mingkai
 - this will disappear when LS1043 support is included in the SDK, its role will be fulfilled
    by dpaa-next
 - was periodically rebased over dpaa-next
 - needs to be brought to date with changes from linux-v3.19-dpaa

:. linux-v3.19-dpaa
 - when LS1043 development continued on a different kernel version, dpaa-next
    no longer was able to fulfill its role while still remaining based on dpaa-next
 - here the hombrew LS1043 support branch prepared by Mingkai was updated to
    contain the SDK1.8 codebase plus several patches that were required by the kernel
    upgrade and some ARM specific patches to the Ethernet drivers that were not included
    in SDK1.8
 - the branch was used as a temporary staging area for the LS1043 DPAA Ethernet drivers
    code until it was pulled in the official LS1043 Linux tree ls1043-linux/linux-v3.19

:: Gianfar branch:

:. gfar-next
 - branch based on the vanilla kernel
 - currently based on v4.1 Linux kernel tag
 - automated testing setup in progress

:: Branches to add

:. dpaa-next-2.0
 - branch does not exist, it will be created for SDK1.9 development
 - will be based on the SDK 1.9 official tree when that will be communicated
 - changes will be pulled from dpaa-next

:. dpaa-next-2.0
 - branch does not exist, it will be created for SDK2.0 development
 - will be based on the SDK 2.0 official tree when that will be communicated
 - changes will be pulled from dpaa-next and ldup

:: Branches to remove
 - temporary branches used as temporary vehicles for the DPAA teams collaboration may be added here
 - these temporary branches need to be removed when their purpose was met

:. qmanv2_squashed
 - changes to ldup QBMan patches were pushed here by Roy for review & inclusion in ldup

:. qman_v2
 - changes to ldup QBMan patches were pushed here by Roy for review & inclusion in ldup

Regards,
Madalin

PS: this information will be updated in Sharepoint at this address:

https://freescale.sharepoint.com/sites/dngsst/nrt/sdktech/ethconn/EthernetConnectivity/SDK%20ethernet%20git%20repository%20branches.aspx