Resolve uprev conflict
Change-Id: Ic702fc889fce15717a31389b9abf23a3c41fdd6a
diff --git a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r392.ebuild
similarity index 97%
rename from chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild
rename to chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r392.ebuild
index 45bc3e1..a7402cb 100644
--- a/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r391.ebuild
+++ b/chromeos-base/chromeos-cr50-dev/chromeos-cr50-dev-0.0.1-r392.ebuild
@@ -4,8 +4,8 @@
EAPI="7"
-CROS_WORKON_COMMIT=("8d39e763aca72c79049009865fe164f59b6c6035" "a77bf0779e1005c9fd840955193ac7257d67bc05" "92221d4688ed01cc361f01d650b82bf7e28078b2")
-CROS_WORKON_TREE=("89e25f3d9d509134c56925218400e73b2e911dc9" "f64a48b91fc35d5760bca966436e0effc9e5cacb" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
+CROS_WORKON_COMMIT=("bba90682d743dd6947751dcfd50871525c2224a2" "a77bf0779e1005c9fd840955193ac7257d67bc05" "92221d4688ed01cc361f01d650b82bf7e28078b2")
+CROS_WORKON_TREE=("bc3dd60d00cdabff1bbcb0ff8e017ac39a1ed6a1" "f64a48b91fc35d5760bca966436e0effc9e5cacb" "2aeca3cffd0e69db866b5623819ecd5bf8db1232")
CROS_WORKON_PROJECT=(
"chromiumos/platform/ec"
"chromiumos/third_party/tpm2"
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7574.ebuild
similarity index 89%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7574.ebuild
index 279c4e9..ae0e9e1 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7573.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r7574.ebuild
@@ -4,8 +4,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("acaf450e8a3692b897605c2b5e4a0a2130b581fb" "8d39e763aca72c79049009865fe164f59b6c6035")
-CROS_WORKON_TREE=("93b1311f87d5a657b4e1f7d5406c477345293598" "89e25f3d9d509134c56925218400e73b2e911dc9")
+CROS_WORKON_COMMIT=("acaf450e8a3692b897605c2b5e4a0a2130b581fb" "bba90682d743dd6947751dcfd50871525c2224a2")
+CROS_WORKON_TREE=("93b1311f87d5a657b4e1f7d5406c477345293598" "bc3dd60d00cdabff1bbcb0ff8e017ac39a1ed6a1")
CROS_WORKON_PROJECT=(
"chromiumos/platform/ec"
"chromiumos/platform/ec"
diff --git a/chromeos-base/libchrome/libchrome-0.0.1-r304.ebuild b/chromeos-base/libchrome/libchrome-0.0.1-r305.ebuild
similarity index 97%
rename from chromeos-base/libchrome/libchrome-0.0.1-r304.ebuild
rename to chromeos-base/libchrome/libchrome-0.0.1-r305.ebuild
index d833010..b7d6c4b7 100644
--- a/chromeos-base/libchrome/libchrome-0.0.1-r304.ebuild
+++ b/chromeos-base/libchrome/libchrome-0.0.1-r305.ebuild
@@ -3,8 +3,8 @@
EAPI="7"
-CROS_WORKON_COMMIT=("f35f2919309cf11b0ddd9deb24a6b145d40d9254" "913f66c91436f2cb1a86dc27184897c2e0ab522a")
-CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "1c9121cf24865664afe27149fa97f9d23e2619bd")
+CROS_WORKON_COMMIT=("162f22363bb018fb620828cb16ad138477a33a22" "56f96fe0efd8d0c6dfae28df63042bb3122c4c67")
+CROS_WORKON_TREE=("a625767bb59509159091f2ab0b71f8b9b4b2e353" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "3bfa6e62b0800f4426c0fc71d9cccabdcd43d79e")
CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/external/libchrome")
CROS_WORKON_LOCALNAME=("platform2" "aosp/external/libchrome")
CROS_WORKON_EGIT_BRANCH=("main" "master")
diff --git a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r175.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r176.ebuild
similarity index 88%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r175.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r176.ebuild
index 3ecb499..130884c 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r175.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r176.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT=("f35f2919309cf11b0ddd9deb24a6b145d40d9254" "0cc41138cdb2234c3f368cd4a6f15a8ccca83bf9")
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a625767bb59509159091f2ab0b71f8b9b4b2e353" "16b5b939ebfb7cff5abd06e3a097573b01590d22")
+CROS_WORKON_COMMIT=("162f22363bb018fb620828cb16ad138477a33a22" "2c01dfc92c3a17bfcc2a7447e2fa0b0ee5289311")
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "a625767bb59509159091f2ab0b71f8b9b4b2e353" "aaada68c28c95ae27bdfc97f08c635bd67d6869a")
CROS_WORKON_PROJECT=("chromiumos/platform2" "chromiumos/platform/camera")
CROS_WORKON_LOCALNAME=("../platform2" "../platform/camera")
CROS_WORKON_DESTDIR=("${S}/platform2" "${S}/platform2/camera_hal")
diff --git a/sys-apps/fwupd/fwupd-1.7.4-r193.ebuild b/sys-apps/fwupd/fwupd-1.7.4-r194.ebuild
similarity index 97%
rename from sys-apps/fwupd/fwupd-1.7.4-r193.ebuild
rename to sys-apps/fwupd/fwupd-1.7.4-r194.ebuild
index 782f9c3..e3e0d00 100644
--- a/sys-apps/fwupd/fwupd-1.7.4-r193.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.4-r194.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-CROS_WORKON_COMMIT="1a88adcae96825105152fc6ade6dbbed6adad840"
-CROS_WORKON_TREE="efe9511cb92f9f1b7c9e516359c3230fa34a6d05"
+CROS_WORKON_COMMIT="4dfa74d7a28b47886ff2362cefa934d7712dec6d"
+CROS_WORKON_TREE="f49e79f7e75feba202c85ac15e4a3efdc57b9156"
CROS_WORKON_PROJECT="chromiumos/third_party/fwupd"
CROS_WORKON_EGIT_BRANCH="fwupd-1.7.6"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2998.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2999.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2998.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2999.ebuild
index c08e0ca..dfa0b87 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2998.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.181-r2999.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="3ee1817ec9793e4fb7a34acb27e0025346c898a3"
-CROS_WORKON_TREE="55babb6e3564c4f8def9b86630c240efb0290bbb"
+CROS_WORKON_COMMIT="d3261c905e67aeb5f36a1c090717a3051bfd9a4a"
+CROS_WORKON_TREE="69f0240d67bec41eab17596fb061d2b8170acf22"
CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.4"
CROS_WORKON_EGIT_BRANCH="chromeos-5.4"
