Resolve uprev conflict
Change-Id: I1386f91eb584ed9db05c3061a3d8674751167c6f
diff --git a/chromeos-base/crosh-extension/crosh-extension-0.48-r1410.ebuild b/chromeos-base/crosh-extension/crosh-extension-0.48-r1411.ebuild
similarity index 92%
rename from chromeos-base/crosh-extension/crosh-extension-0.48-r1410.ebuild
rename to chromeos-base/crosh-extension/crosh-extension-0.48-r1411.ebuild
index 18b9e7b..a0dfe9b 100644
--- a/chromeos-base/crosh-extension/crosh-extension-0.48-r1410.ebuild
+++ b/chromeos-base/crosh-extension/crosh-extension-0.48-r1411.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="88d8fea66e5dc1c2bc16401d38b26009e8c2cae3"
-CROS_WORKON_TREE=("3d899703f696fcdfc099de06cedd32f6427689c6" "6ac5f9629491ef6eaf4c8e08b7b62116de4bf762" "fdd6dfdb0b99466adf9a3a1b44c8097845c940cf" "866f1553ef376ac21cd4b1b00f1efecbb8d0c132" "28693a3631abe53118a13a33584ef1a0e54eec37" "818feadd37d21ca7c3a3c3bf100ccfe0e63f1c8c" "eb4e04bfca826c3740f89c2cddab5056d218668c")
+CROS_WORKON_COMMIT="5e0c8dbd9b45731a6554d116461635052b2e38e6"
+CROS_WORKON_TREE=("3d899703f696fcdfc099de06cedd32f6427689c6" "6ac5f9629491ef6eaf4c8e08b7b62116de4bf762" "c4bc04ecbc771a4c6af6aa6d749d2ef52d3522ee" "866f1553ef376ac21cd4b1b00f1efecbb8d0c132" "28693a3631abe53118a13a33584ef1a0e54eec37" "818feadd37d21ca7c3a3c3bf100ccfe0e63f1c8c" "eb4e04bfca826c3740f89c2cddab5056d218668c")
CROS_WORKON_PROJECT="apps/libapps"
CROS_WORKON_LOCALNAME="third_party/libapps"
CROS_WORKON_SUBTREE="libdot hterm nassh ssh_client terminal wasi-js-bindings wassh"
diff --git a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2209.ebuild b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2210.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2209.ebuild
rename to sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2210.ebuild
index b50203c..ded5dd0 100644
--- a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2209.ebuild
+++ b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.135-r2210.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="7af632a8881d94b2b4576adc1c2eb26ae733a952"
-CROS_WORKON_TREE="c2b108052f6e36725483c69aa288b79f549b51cc"
+CROS_WORKON_COMMIT="f137cdc391b1bae0d9da9061d4694465876f424a"
+CROS_WORKON_TREE="170e79934d7bd3cebd06b7a288603bd69222f7cc"
CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.10"
CROS_WORKON_EGIT_BRANCH="chromeos-5.10"
