aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-05-18 11:17:03 +0200
committerThierry Reding <treding@nvidia.com>2018-07-11 14:21:56 +0200
commitf8bae64864b1447a6606db683664769bd5882a8b (patch)
treeac38990f81daac86f34f62564321d97109bd1739
parent24fa78da4d5783e105d949828c6309d10dd24b6e (diff)
downloadmaint-scripts-f8bae64864b1447a6606db683664769bd5882a8b.tar.gz
Final branches for v4.18-rc1
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot16
1 files changed, 7 insertions, 9 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index 2db0aee..50887ef 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,13 +1,11 @@
-merge_base=v4.16-rc1
+merge_base=v4.17-rc1
-branches="${branches} for-4.17/clk" # on v4.16-rc1
+branches="${branches} for-4.18/clk" # on v4.17-rc1
-arm_soc="${arm_soc} for-4.17/misc" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/dt-bindings" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/firmware" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/soc" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/arm/dt" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/arm64/defconfig" # on v4.16-rc1
-arm_soc="${arm_soc} for-4.17/arm64/dt" # on v4.16-rc1
+arm_soc="${arm_soc} for-4.18/dt-bindings" # on v4.17-rc1
+arm_soc="${arm_soc} for-4.18/memory" # on v4.17-rc1
+arm_soc="${arm_soc} for-4.18/arm/soc" # on v4.17-rc1
+arm_soc="${arm_soc} for-4.18/arm/dt" # on v4.17-rc1
+arm_soc="${arm_soc} for-4.18/arm64/dt" # on v4.17-rc1
branches="${arm_soc} ${branches}"