aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2017-01-25 09:20:14 +0100
committerThierry Reding <treding@nvidia.com>2017-01-25 09:20:14 +0100
commit0bb489dd1ea565bd22af6dd24394176405356853 (patch)
tree29629f3ca3f52c4e77db4261df09dd55fc35d5bd
parentde95da65d04ffc7acc468983ca35ceec5ab1d61c (diff)
downloadmaint-scripts-0bb489dd1ea565bd22af6dd24394176405356853.tar.gz
Final branches for v4.10
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot21
1 files changed, 14 insertions, 7 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index 4d9d405..bafe2f2 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,10 +1,17 @@
-merge_base=v4.8-rc1
+merge_base=v4.9-rc1
-branches="${branches} for-4.9/clk" # on v4.8-rc1
+arm_soc="${arm_soc} for-4.10/mailbox" # on for-4.10/soc
+arm_soc="${arm_soc} for-4.10/firmware" # on for-4.10/mailbox
+arm_soc="${arm_soc} for-4.10/reset" # on for-4.10/firmware
+arm_soc="${arm_soc} for-4.10/bus" # on v4.9-rc1
+arm_soc="${arm_soc} for-4.10/soc" # on v4.9-rc1
+arm_soc="${arm_soc} for-4.10/dt-bindings" # on v4.9-rc1
+arm_soc="${arm_soc} for-4.10/arm/dt" # on v4.9-rc1
+arm_soc="${arm_soc} for-4.10/arm/defconfig" # on v4.9-rc1
+arm_soc="${arm_soc} for-4.10/arm64/dt" # on for-4.10/firmware
+arm_soc="${arm_soc} for-4.10/arm64/defconfig" # on v4.9-rc1
-arm_soc="${arm_soc} for-4.9/bus" # on v4.8-rc1
-arm_soc="${arm_soc} for-4.9/soc" # on v4.8-rc1
-arm_soc="${arm_soc} for-4.9/arm/dt" # on v4.8-rc1
-arm_soc="${arm_soc} for-4.9/arm64/dt" # on v4.8-rc1
+branches="${branches} for-4.10/clk" # on for-4.10/firmware
+branches="${branches} for-4.10/i2c" # on for-4.10/firmware
-branches="${branches} ${arm_soc}"
+branches="${arm_soc} ${branches}"