aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2022-08-19 09:20:42 +0300
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>2022-08-19 09:20:42 +0300
commite33ac10ed4d074c7385e21a1a0438eac0a2a5cc7 (patch)
tree5b775e4c659fc9c15338becf687052e6bafaf86d
parent45c255544265086549c33e9052f1af388c77e3ae (diff)
automerge-ci: disable sm8250-typec branch
The SM8250 TypeC support needs to be rebased on top of Bryan's patches and on top of Bjorn's work for the USB-C/DP/etc support. Disable it for now. While we are at it, drop the old sm8250-gdsc branch which was commented for quite a while and now has been fully merged. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-rw-r--r--automerge-ci.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/automerge-ci.conf b/automerge-ci.conf
index 5ef5fb8..60d5c5f 100644
--- a/automerge-ci.conf
+++ b/automerge-ci.conf
@@ -29,9 +29,7 @@ qcs404-defconfig https://git.linaro.org/landing-teams/working/qualcomm/kernel.gi
qca6390 https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-qca6390
sm8250 https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sm8250
-# merged with two patches being deferred
-#sm8250-gdsc https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sm8250-gdsc
-sm8250-typec https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sm8250-typec
+#sm8250-typec https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sm8250-typec
#cpuidle https://git.linaro.org/people/amit.kucheria/kernel.git wrk3/automerge/idle-branch
#remoteproc https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-remoteproc