Merge #166

166: clearify license text, add workround to use raw-cpuid r=stlankes a=stlankes The workaround should solve issue #164 and is only necessry until gz/rust-x86#71 is accepted. Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
hermit-os · Feb 3, 2021 · 166ef71 · 166ef71
2 parents 2417630 + f30a2bf
commit 166ef71
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ authors = [
 	"Colin Finck <colin.finck@rwth-aachen.de>"
 ]
 build = "build.rs"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["unikernel", "libos"]
 categories = ["os"]
@@ -80,7 +80,7 @@ default-features = false
 version = "0.6.*"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies.x86]
-version = "0.35.*"
+version = "0.36.*"
 default-features = false
 
 # The development profile, used for `cargo build`.