aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2017-03-08 14:51:40 +0100
committerThierry Reding <treding@nvidia.com>2017-03-08 14:51:40 +0100
commitbc36c7ee0ff2d66bb00c4ad28248ad7581e78c4f (patch)
tree7b39bd3cc1ed48ce89c36855f681cdcb5fb74e46
parent0bb489dd1ea565bd22af6dd24394176405356853 (diff)
downloadmaint-scripts-bc36c7ee0ff2d66bb00c4ad28248ad7581e78c4f.tar.gz
Final branches for v4.11
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot20
1 files changed, 7 insertions, 13 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index bafe2f2..4ff23d5 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,17 +1,11 @@
-merge_base=v4.9-rc1
+merge_base=v4.10-rc2
-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.11/memory" # on v4.10-rc2
+arm_soc="${arm_soc} for-4.11/soc" # on v4.10-rc2
+arm_soc="${arm_soc} for-4.11/arm/dt" # on v4.10-rc2
+arm_soc="${arm_soc} for-4.11/arm64/dt" # on v4.10-rc2
-branches="${branches} for-4.10/clk" # on for-4.10/firmware
-branches="${branches} for-4.10/i2c" # on for-4.10/firmware
+branches="${branches} for-4.11/clk" # on v4.10-rc2
+branches="${branches} for-4.11/i2c" # on v4.10-rc2
branches="${arm_soc} ${branches}"