Resolve uprev conflict
Change-Id: Ife033ef8ed9ec1e15bbe2695f8301b967bcb8700
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5529.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5530.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5529.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5530.ebuild
index 1c1fec8..b26de1d 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5529.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5530.ebuild
@@ -4,8 +4,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("feb8590958f0d510e2819b0b86603cc70fc032fe" "c6095192742c9f59f72a6178ece5a2dd8cea4e43")
-CROS_WORKON_TREE=("0e27e6033b951eee59a3d80f05b2128d50f5a409" "231827d025fd8a333ffb02249aee9960ae19a701")
+CROS_WORKON_COMMIT=("8fb6fbd482f3acbe403e443b45b77e2ecddd18a0" "c6095192742c9f59f72a6178ece5a2dd8cea4e43")
+CROS_WORKON_TREE=("3b408c72c21ced149ae4d782efadfb0ddce4540d" "231827d025fd8a333ffb02249aee9960ae19a701")
CROS_WORKON_PROJECT=(
"chromiumos/platform/ec"
"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10236.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10237.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10236.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10237.ebuild
index bc5519f..74f1429 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10236.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10237.ebuild
@@ -17,8 +17,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("feb8590958f0d510e2819b0b86603cc70fc032fe" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("0e27e6033b951eee59a3d80f05b2128d50f5a409" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("8fb6fbd482f3acbe403e443b45b77e2ecddd18a0" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("3b408c72c21ced149ae4d782efadfb0ddce4540d" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
CROS_WORKON_PROJECT=(
"chromiumos/platform/ec"
"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2093.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2094.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2093.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2094.ebuild
index a3e6ff9..f66f46c 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2093.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2094.ebuild
@@ -9,8 +9,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("feb8590958f0d510e2819b0b86603cc70fc032fe" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("0e27e6033b951eee59a3d80f05b2128d50f5a409" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("8fb6fbd482f3acbe403e443b45b77e2ecddd18a0" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("3b408c72c21ced149ae4d782efadfb0ddce4540d" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
CROS_WORKON_PROJECT=(
"chromiumos/platform/ec"
"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r709.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r710.ebuild
similarity index 94%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r709.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r710.ebuild
index 616b094..9f2fc6a 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r709.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r710.ebuild
@@ -4,8 +4,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "feb8590958f0d510e2819b0b86603cc70fc032fe")
-CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "0e27e6033b951eee59a3d80f05b2128d50f5a409")
+CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "8fb6fbd482f3acbe403e443b45b77e2ecddd18a0")
+CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "3b408c72c21ced149ae4d782efadfb0ddce4540d")
CROS_WORKON_USE_VCSID=1
CROS_WORKON_PROJECT=(
"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8241.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8242.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r8241.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r8242.ebuild
index bee4dcc..10ae654 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8241.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8242.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-CROS_WORKON_COMMIT="feb8590958f0d510e2819b0b86603cc70fc032fe"
-CROS_WORKON_TREE="0e27e6033b951eee59a3d80f05b2128d50f5a409"
+CROS_WORKON_COMMIT="8fb6fbd482f3acbe403e443b45b77e2ecddd18a0"
+CROS_WORKON_TREE="3b408c72c21ced149ae4d782efadfb0ddce4540d"
CROS_WORKON_PROJECT="chromiumos/platform/ec"
CROS_WORKON_LOCALNAME="platform/ec"
PYTHON_COMPAT=( python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7345.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7346.ebuild
similarity index 88%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7345.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7346.ebuild
index 0995d4a9..7abfb97 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7345.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7346.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="feb8590958f0d510e2819b0b86603cc70fc032fe"
-CROS_WORKON_TREE="0e27e6033b951eee59a3d80f05b2128d50f5a409"
+CROS_WORKON_COMMIT="8fb6fbd482f3acbe403e443b45b77e2ecddd18a0"
+CROS_WORKON_TREE="3b408c72c21ced149ae4d782efadfb0ddce4540d"
CROS_WORKON_PROJECT="chromiumos/platform/ec"
CROS_WORKON_LOCALNAME="platform/ec"
CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r10175.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r10176.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r10175.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r10176.ebuild
index 7c6e629b..c82356f 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r10175.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r10176.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="feb8590958f0d510e2819b0b86603cc70fc032fe"
-CROS_WORKON_TREE="0e27e6033b951eee59a3d80f05b2128d50f5a409"
+CROS_WORKON_COMMIT="8fb6fbd482f3acbe403e443b45b77e2ecddd18a0"
+CROS_WORKON_TREE="3b408c72c21ced149ae4d782efadfb0ddce4540d"
CROS_WORKON_PROJECT="chromiumos/platform/ec"
CROS_WORKON_LOCALNAME="platform/ec"
