Mark this release to be acpi v6.0.0, resolve merge conflict

Author: IsaacWoods

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
         components: llvm-tools-preview
 
     - name: Build crates
-      run: cargo build -p acpi -p aml --target $TARGET
+      run: cargo build --target $TARGET
 
   test:
     runs-on: ubuntu-latest
@@ -79,14 +79,8 @@ jobs:
         profile: minimal
         components: clippy
 
-    - name: Run clippy (ACPI)
-      run: cargo clippy -p acpi
+    - name: Run clippy
+      run: cargo clippy
 
-    - name: Run clippy (ACPI tests)
-      run: cargo clippy -p acpi --tests
-
-    - name: Run clippy (AML)
-      run: cargo clippy -p aml
-
-    - name: Run clippy (AML tests)
-      run: cargo clippy -p aml --tests
+    - name: Run clippy (tests)
+      run: cargo clippy --tests

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [package]
 name = "acpi"
-version = "5.1.0"
+version = "6.0.0"
 authors = ["Isaac Woods"]
 repository = "https://github.com/rust-osdev/acpi"
 description = "A pure-Rust library for interacting with ACPI"