diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2021-11-03 07:42:16 +0100 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2021-11-03 07:42:16 +0100 |
| commit | ac0ae4e7ddb223a639008a4b1c80224f029eca7e (patch) | |
| tree | a340e49eab6050eff1c818ecaac438807707868e | |
| parent | 570b56ae2b35c7e4f03ffaee54ab77568558c7ac (diff) | |
automerge-ci: disable sa8155p branches
The branches fail to merge, and it's been noticed that they are not
constructed correctly (since they include merges from other topic
branches). This needs to be fixed before they are added back.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
| -rw-r--r-- | automerge-ci.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automerge-ci.conf b/automerge-ci.conf index 26f44b6..a432ecd 100644 --- a/automerge-ci.conf +++ b/automerge-ci.conf @@ -52,5 +52,5 @@ sdx55-defconfig https://git.linaro.org/landing-teams/working/qualcomm/kernel.git sm8350-drivers https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sm8350-drivers #sa8155p adp branches -sa8155p-adp-dts-drivers https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sa8155p-dts-drivers -sa8155p-adp-defconfig https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sa8155p-defconfig +#sa8155p-adp-dts-drivers https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sa8155p-dts-drivers +#sa8155p-adp-defconfig https://git.linaro.org/landing-teams/working/qualcomm/kernel.git tracking-qcomlt-sa8155p-defconfig |