arm64 vs arm tree for BCM2837 DT pull requests
eric at anholt.net
Tue May 16 15:04:54 PDT 2017
I'm looking for feedback on how the ARM folks would like to see pull
requests for Raspberry Pi 3 devicetree changes. My problem is trying to
merge patches like:
which depends on:
bcm2837's DT is in arm64/, but includes the bcm283x.dtsi under arm/
(which also contains pi0-2), so we often end up with cross-tree
dependencies when trying to merge a patch series affecting peripherals
common to all of them. How I've done this in the past is in
Send a PR for bcm2835-dt-next for the arm/ BCM283x changes, merge that
tag to bcm2835-dt-64-next, apply the arm64 change, and send a separate
PR for that branch.
This seems silly to me -- in trying to keep a small arm64/ change out of
the branch for arm/, we end up pulling in much larger arm/ changes to
the arm64/ branch. Also, this process doesn't work if we need to make a
single-commit change across both (like if we decided to change a node
name that's referenced by '&' in the board-specific .dts files).
So, I'd like to ask that I be able to merge all the BCM283x DT changes
through my bcm2835-dt-next branch, if that's OK.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 832 bytes
Desc: not available
More information about the linux-rpi-kernel