merge origin

15 files changed, 32 insertions, 6 deletions

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 864d2584c..a00154fe1 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -68,7 +68,7 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_WATCHDOG=y
@@ -1807,6 +1807,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 3b8207cce..8525d62f7 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -68,7 +68,7 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_WATCHDOG=y
@@ -1799,6 +1799,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index bfb6b2fb5..1c160c167 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1825,6 +1826,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index aad6dce32..201dc986e 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1818,6 +1819,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 05778dcc2..bf2206fb0 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1777,6 +1778,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index f485c88d6..c6f4d42c0 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1770,6 +1771,7 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 947abfce0..d62fd43ff 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -72,7 +72,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -1533,6 +1533,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 14d2577e0..4cae99eee 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -72,7 +72,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -1524,6 +1524,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index e142cc157..6f1ce69eb 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -41,6 +41,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1397,6 +1398,7 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index ecf65b16c..ff2a7dd35 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -41,6 +41,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1388,6 +1389,7 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 8001ff78d..7c73becd8 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1402,6 +1403,7 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_PGT_DUMP=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 5a4d45ade..af05612a7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -42,6 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -1393,6 +1394,7 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index b5736de7c..829939d68 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -75,7 +75,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -1571,6 +1571,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_MIXED=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index a9017635c..b0282d8c6 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -75,7 +75,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_UPGRADE is not set
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -1562,6 +1562,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_MIXED=y
diff --git a/kernel.spec b/kernel.spec
index 490b4fd7a..bae428e08 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -83,6 +83,7 @@ Summary: The Linux kernel
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
 %global baserelease 250
+
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2989,6 +2990,9 @@ fi
 #
 #
 %changelog
+* Wed Jul 01 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.7-200
+- Linux v5.7.7
+
 * Mon Jun 29 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.6-200
 - Linux v5.7.6 rebase