summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chong <victor.chong@linaro.org>2020-06-29 17:25:38 +0100
committerVictor Chong <victor.chong@linaro.org>2020-07-02 15:06:47 +0100
commit6bf90d580a03704244374231658bc340b87814f0 (patch)
tree9ed0b0e98f5e4e57f8523649656ee4f196db0d6f
parent3464c49f19912734f263c9f44a613e0b65e71cb9 (diff)
downloadmanifest-6bf90d580a03704244374231658bc340b87814f0.tar.gz
Revert "linaro.xml: repo sync android-mainline kernel"
This reverts commit 02c34611761366414cb58105988b7a5dbd55797d. Else causes build error: build/make/core/base_rules.mk:314: error: kernel/linaro/hisilicon-4.14/drivers/staging/greybus/tools: MODULE.TARGET.EXECUTABLES.gb_loopback_test already defined by kernel/common/mainline/drivers/staging/greybus/tools.
-rw-r--r--linaro.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/linaro.xml b/linaro.xml
index 35a43bb04..5b440aa67 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -21,6 +21,4 @@
<project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/>
<project path="android-build-configs" name="android-build-configs" revision="master" remote="linaro-android"/>
-
- <project path="kernel/common/mainline" name="kernel/common" revision="android-mainline"/>
</manifest>