diff --git a/.files b/.files
index bac84f2..dda20f7 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index f8b8f89..3424be5 100644
--- a/.rev
+++ b/.rev
@@ -548,8 +548,6 @@ You added ec_access.c with a GPL-2.0 (only) license. Now the spec file has to be
     <comment></comment>
     <requestid>862643</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="66" vrev="1">
     <srcmd5>ca40ddff1aa9afcf265a94ecdb317598</srcmd5>
     <version>20210331</version>
@@ -558,5 +556,12 @@ You added ec_access.c with a GPL-2.0 (only) license. Now the spec file has to be
     <comment></comment>
     <requestid>886751</requestid>
   </revision>
->>>>>>> Stashed changes
+  <revision rev="67" vrev="1">
+    <srcmd5>c18e7276b58e16db87c656894d40b388</srcmd5>
+    <version>20210604</version>
+    <time>1625675378</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>904047</requestid>
+  </revision>
 </revisionlist>
diff --git a/acpica-unix-20210105.tar.gz b/acpica-unix-20210105.tar.gz
deleted file mode 120000
index eca59d0..0000000
--- a/acpica-unix-20210105.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeigo754gbqghxiofw3at2xhthemqmbrbhw22vapub6uicnr3fsode4
\ No newline at end of file
diff --git a/acpica-unix-20210331.tar.gz b/acpica-unix-20210331.tar.gz
deleted file mode 120000
index a432d5b..0000000
--- a/acpica-unix-20210331.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidxvlnoyx4bs5fo2utzkybh5whk47w3fu6ux3zb4s67drbgdnt5uq
\ No newline at end of file
diff --git a/acpica-unix-20210604.tar_0.gz b/acpica-unix-20210604.tar_0.gz
new file mode 120000
index 0000000..f2c8aef
--- /dev/null
+++ b/acpica-unix-20210604.tar_0.gz
@@ -0,0 +1 @@
+/ipfs/bafybeibpxep3upnxxi5d4dltdpfeuyqc6ikux5hqdzqgpmixkyi2bks4wu
\ No newline at end of file
diff --git a/acpica.changes b/acpica.changes
index 0aa04be..719dd7c 100644
--- a/acpica.changes
+++ b/acpica.changes
@@ -1,6 +1,26 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
+Wed Jun 30 11:26:33 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 20210604:
+  * ACPICA kernel-resident subsystem
+    * Cleaned up (delete) the context mutex during local address
+      handler object deletion.
+    * Fixed a memory leak caused by the _CID repair function.
+    * Add support for PlatformRtMechanism OperationRegion handler.
+    * Add a new utility function, AcpiUtConvertUuidToString.
+  * iASL Compiler/Disassembler and ACPICA tools:
+    * Added full support for the PRMT ACPI table
+    * Added full support for the BDAT ACPI table.
+    * Added full support for the RGRT ACPI table.
+    * Added full support for the SVKL ACPI table.
+    * Completed full support for the IVRS ACPI table.
+    * Added compiler support for IVRS, updated disassembler support
+    * Added a new utility, UtIsIdInteger, to determine if a
+      HID/CID is an integer or a string.
+  * Headers: Added more structs to the CEDT table
+  * ACPI 6.4: MADT: added Multiprocessor Wakeup Mailbox Structure.
+
+-------------------------------------------------------------------
 Fri Apr 16 15:01:48 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 
 - Update to version 20210331
@@ -18,7 +38,6 @@ Fri Apr 16 15:01:48 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
   * Update of the CEDT template.
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Jan  5 20:40:38 UTC 2021 - Matthias Eliasson <elimat@opensuse.org>
 
 - Update to version 20210105
diff --git a/acpica.spec b/acpica.spec
index b3f1231..78b7497 100644
--- a/acpica.spec
+++ b/acpica.spec
@@ -20,16 +20,12 @@
 %define kver %(rpm -q --qf '%%{VERSION}' kernel-source)
 %define dmp_ver %{kver}
 Name:           acpica
-<<<<<<< Updated upstream
-Version:        20210105
-=======
-Version:        20210331
->>>>>>> Stashed changes
+Version:        20210604
 Release:        0
 Summary:        A set of tools to display and debug BIOS ACPI tables
 License:        GPL-2.0-only
 URL:            https://acpica.org
-Source:         https://acpica.org/sites/acpica/files/%{src_dir}.tar.gz
+Source:         https://acpica.org/sites/acpica/files/%{src_dir}.tar_0.gz
 Source1:        ec_access.c
 Source2:        acpi_genl.tar.bz2
 Source3:        acpi_validate