aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2019-05-08 14:50:39 +0200
committerThierry Reding <treding@nvidia.com>2019-05-08 14:50:39 +0200
commit106b3511fce07b240dc121bd423de7dc604004a1 (patch)
treeb05edeffe11f1b5c02d53a98253352cde4a5ceb0
parenta8b11a7165dbc34a0cf26c9726eb8ac9fbb1a445 (diff)
downloadmaint-scripts-106b3511fce07b240dc121bd423de7dc604004a1.tar.gz
Final branches for v5.2
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot9
1 files changed, 8 insertions, 1 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index 6f84180..3381882 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,7 +1,14 @@
merge_base=v5.1-rc1
+arm_soc="${arm_soc} for-5.2/bus" # on v5.1-rc1
arm_soc="${arm_soc} for-5.2/soc" # on v5.1-rc1 and reset/acquire
+arm_soc="${arm_soc} for-5.2/firmware" # on v5.1-rc1
+arm_soc="${arm_soc} for-5.2/memory" # on v5.1-rc1
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
+arm_soc="${arm_soc} for-5.2/arm/dt" # on v5.1-rc1
+arm_soc="${arm_soc} for-5.2/arm/defconfig" # on v5.1-rc1 and multi-v7-defconfig-for-v5.2-signed
+arm_soc="${arm_soc} for-5.2/arm64/soc" # on v5.1-rc1
+arm_soc="${arm_soc} for-5.2/arm64/dt" # on v5.1-rc3
+arm_soc="${arm_soc} for-5.2/arm64/defconfig" # on v5.1-rc1
branches="${arm_soc} ${branches}"