Git workflow for corporate Linux kernel development

Question

I work for a company which builds embedded systems using Linux. Historically we\'ve always used CVS to store our kernel work. Our kernels end up being a collection of:

Answer 1

Rebase is good for integrating upstream branches into one's local branch, provided one does not push said local branch (since the history of that local branch has been rewritten). See for instance "git workflow and rebase vs merge questions".

A dedicated "public" branch (i.e. meant to be pushed) should be dedicated in each of the developers Git repository, in order to merge/cherry-pick the relevant changes to push.
Potentially, several public branches could coexist, one per kernel version to maintain/fix, if needed.

A central repo can then be set to integrate (i.e. pulled) all the developer branches pushed in it.

See also "git releases management" for more on the merge workflow and publication topics.