aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2019-04-02 18:59:08 +0200
committerThierry Reding <treding@nvidia.com>2019-04-02 18:59:08 +0200
commita8b11a7165dbc34a0cf26c9726eb8ac9fbb1a445 (patch)
tree7476dea4985e0a609363307aa982093a771ca240
parentfd92e8fc9361991cb8e91eb943d7356a9bf9c641 (diff)
downloadmaint-scripts-a8b11a7165dbc34a0cf26c9726eb8ac9fbb1a445.tar.gz
Initial branches for v5.2-rc1
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot17
1 files changed, 4 insertions, 13 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index 2cb3669..6f84180 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,16 +1,7 @@
-merge_base=v5.0-rc1
+merge_base=v5.1-rc1
-arm_soc="${arm_soc} for-5.1/clk" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/cpufreq" # on v5.0-rc1
-
-arm_soc="${arm_soc} for-5.1/dt-bindings" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/soc" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/firmware" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/arm/core" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/arm/dt" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/arm64/dt" # on v5.0-rc1
-arm_soc="${arm_soc} for-5.1/arm64/defconfig" # on v5.0-rc1
-
-arm_soc="${arm_soc} for-5.1/fixes" # on for-5.1/arm64/dt
+arm_soc="${arm_soc} for-5.2/soc" # on v5.1-rc1 and reset/acquire
+arm_soc="${arm_soc} for-5.2/arm/soc" # on v5.1-rc1
+arm_soc="${arm_soc} for-5.2/arm64/dt" # on v5.1-rc1
branches="${arm_soc} ${branches}"