grant-olson/linux

Linux kernel source tree - with fixes for Pine64 Ox64 risc-v boards

linux's Issues

Proposed OpenBouffalo Branching Structure

I've set up my repo with my proposed OpenBouffalo branch structure. The design has a branch bl808/board which holds an up-to-date version of board configuration files such as the dtsi's and defconfigs. This prevents us from having merge hell when driver branches are unaware of each other. Most branches are expected to branch from this branch.

The current setup is:

• Mainline v6.2
  • bl808/board
    • bl808/emac
    • bl808/mailbox
    • bl808/pinctrl-hwrng
    • bl808/sdhci
    • bl808/uart
    • bl808/usb

These branches all exist on my repository.

Workflow to rebase to a new linux version.

1. All the branches get rebased.
2. A new version of bl808/all is created.
3. git merge bl808/board
4. git merge bl808/emac ... with all modules.

When new drivers are merged, we should get patches broken up by:

1. Device tree updates
2. defconfigs
3. Actual code

Upon approval 1 and 2 should be merged to bl808/board and a branch will be created for the actual code.

An example of this is under the branchbl808/all-test so as not to conflict with the real branch upstream.