diff options
| -rw-r--r-- | 0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch | 141 | ||||
| -rw-r--r-- | baseconfig/CONFIG_NTB_IDT | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_TEST_KMOD | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-aarch64.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 3 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 3 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 3 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 3 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 3 | ||||
| -rw-r--r-- | kernel-i686.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 3 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 3 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 3 | ||||
| -rw-r--r-- | kernel-s390x.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 3 | ||||
| -rw-r--r-- | kernel-x86_64.config | 3 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 2 |
26 files changed, 71 insertions, 146 deletions
diff --git a/0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch b/0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch deleted file mode 100644 index 4eaaac1e2..000000000 --- a/0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 93c501a65e23aba07389ad95b7e31834ae6d4722 Mon Sep 17 00:00:00 2001 -From: Adrian Hunter <adrian.hunter@intel.com> -Date: Wed, 21 Jun 2017 15:08:39 +0300 -Subject: [PATCH 14/16] mmc: sdhci-acpi: Workaround conflict with PCI wifi on - GPD Win handheld - -GPDwin uses PCI wifi which conflicts with SDIO's use of -acpi_device_fix_up_power() on child device nodes. Specifically -acpi_device_fix_up_power() causes the wifi module to get turned off. -Identifying GPDwin is problematic, but since SDIO is only used for wifi, -the presence of the PCI wifi card in the expected slot with an ACPI -companion node, is used to indicate that acpi_device_fix_up_power() should -be avoided. - -[labbott@redhat.com: Rebased for Fedora] -Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> -Acked-by: Hans de Goede <hdegoede@redhat.com> -Tested-by: Hans de Goede <hdegoede@redhat.com> -Cc: stable@vger.kernel.org ---- - drivers/mmc/host/sdhci-acpi.c | 70 +++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 64 insertions(+), 6 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c -index cf66a3d..ac678e9 100644 ---- a/drivers/mmc/host/sdhci-acpi.c -+++ b/drivers/mmc/host/sdhci-acpi.c -@@ -45,6 +45,7 @@ - #include <asm/cpu_device_id.h> - #include <asm/intel-family.h> - #include <asm/iosf_mbi.h> -+#include <linux/pci.h> - #endif - - #include "sdhci.h" -@@ -134,6 +135,16 @@ static bool sdhci_acpi_byt(void) - return x86_match_cpu(byt); - } - -+static bool sdhci_acpi_cht(void) -+{ -+ static const struct x86_cpu_id cht[] = { -+ { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT }, -+ {} -+ }; -+ -+ return x86_match_cpu(cht); -+} -+ - #define BYT_IOSF_SCCEP 0x63 - #define BYT_IOSF_OCP_NETCTRL0 0x1078 - #define BYT_IOSF_OCP_TIMEOUT_BASE GENMASK(10, 8) -@@ -178,6 +189,45 @@ static bool sdhci_acpi_byt_defer(struct device *dev) - return false; - } - -+static bool sdhci_acpi_cht_pci_wifi(unsigned int vendor, unsigned int device, -+ unsigned int slot, unsigned int parent_slot) -+{ -+ struct pci_dev *dev, *parent, *from = NULL; -+ -+ while (1) { -+ dev = pci_get_device(vendor, device, from); -+ pci_dev_put(from); -+ if (!dev) -+ break; -+ parent = pci_upstream_bridge(dev); -+ if (ACPI_COMPANION(&dev->dev) && PCI_SLOT(dev->devfn) == slot && -+ parent && PCI_SLOT(parent->devfn) == parent_slot && -+ !pci_upstream_bridge(parent)) { -+ pci_dev_put(dev); -+ return true; -+ } -+ from = dev; -+ } -+ -+ return false; -+} -+ -+/* -+ * GPDwin uses PCI wifi which conflicts with SDIO's use of -+ * acpi_device_fix_up_power() on child device nodes. Identifying GPDwin is -+ * problematic, but since SDIO is only used for wifi, the presence of the PCI -+ * wifi card in the expected slot with an ACPI companion node, is used to -+ * indicate that acpi_device_fix_up_power() should be avoided. -+ */ -+static inline bool sdhci_acpi_no_fixup_child_power(const char *hid, -+ const char *uid) -+{ -+ return sdhci_acpi_cht() && -+ !strcmp(hid, "80860F14") && -+ !strcmp(uid, "2") && -+ sdhci_acpi_cht_pci_wifi(0x14e4, 0x43ec, 0, 28); -+} -+ - #else - - static inline void sdhci_acpi_byt_setting(struct device *dev) -@@ -189,6 +239,12 @@ static inline bool sdhci_acpi_byt_defer(struct device *dev) - return false; - } - -+static inline bool sdhci_acpi_no_fixup_child_power(const char *hid, -+ const char *uid) -+{ -+ return false; -+} -+ - #endif - - static int bxt_get_cd(struct mmc_host *mmc) -@@ -389,18 +445,20 @@ static int sdhci_acpi_probe(struct platform_device *pdev) - if (acpi_bus_get_device(handle, &device)) - return -ENODEV; - -+ hid = acpi_device_hid(device); -+ uid = device->pnp.unique_id; -+ - /* Power on the SDHCI controller and its children */ - acpi_device_fix_up_power(device); -- list_for_each_entry(child, &device->children, node) -- if (child->status.present && child->status.enabled) -- acpi_device_fix_up_power(child); -+ if (!sdhci_acpi_no_fixup_child_power(hid, uid)) { -+ list_for_each_entry(child, &device->children, node) -+ if (child->status.present && child->status.enabled) -+ acpi_device_fix_up_power(child); -+ } - - if (sdhci_acpi_byt_defer(dev)) - return -EPROBE_DEFER; - -- hid = acpi_device_hid(device); -- uid = device->pnp.unique_id; -- - iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!iomem) - return -ENOMEM; --- -2.7.5 - diff --git a/baseconfig/CONFIG_NTB_IDT b/baseconfig/CONFIG_NTB_IDT new file mode 100644 index 000000000..0e9236c2a --- /dev/null +++ b/baseconfig/CONFIG_NTB_IDT @@ -0,0 +1 @@ +CONFIG_NTB_IDT=m diff --git a/baseconfig/CONFIG_TEST_KMOD b/baseconfig/CONFIG_TEST_KMOD new file mode 100644 index 000000000..59165b345 --- /dev/null +++ b/baseconfig/CONFIG_TEST_KMOD @@ -0,0 +1 @@ +# CONFIG_TEST_KMOD is not set diff --git a/baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM b/baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM new file mode 100644 index 000000000..5244e5664 --- /dev/null +++ b/baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM @@ -0,0 +1 @@ +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index e90c40b32..8c903c49b 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3804,6 +3804,7 @@ CONFIG_NR_CPUS=256 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5574,6 +5575,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -6364,6 +6366,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3770e70f4..f6b5801eb 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3783,6 +3783,7 @@ CONFIG_NR_CPUS=256 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5551,6 +5552,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -6341,6 +6343,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 45ec7bdd2..429aef780 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4051,6 +4051,7 @@ CONFIG_NR_CPUS=32 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -6066,6 +6067,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -6930,6 +6932,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 30e0b0c26..1276a2caa 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3877,6 +3877,7 @@ CONFIG_NR_CPUS=32 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5671,6 +5672,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -6481,6 +6483,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index f941b0d8e..fc0742211 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3856,6 +3856,7 @@ CONFIG_NR_CPUS=32 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5648,6 +5649,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -6458,6 +6460,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0358df003..43ca8c143 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4030,6 +4030,7 @@ CONFIG_NR_CPUS=32 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -6043,6 +6044,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -6907,6 +6909,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 0ad5354e1..3cc4dbcfe 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3673,6 +3673,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NSC_GPIO=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5236,6 +5237,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5968,6 +5970,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 915004bb8..e61d09a1d 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3693,6 +3693,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NSC_GPIO=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5258,6 +5259,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5990,6 +5992,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 628f9080e..31a6aaef5 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3693,6 +3693,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NSC_GPIO=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5258,6 +5259,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5990,6 +5992,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-i686.config b/kernel-i686.config index 5fe9fb4b4..5629a3f20 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3673,6 +3673,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NSC_GPIO=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5236,6 +5237,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5968,6 +5970,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index dfae2a5f4..b7ccef31e 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3519,6 +3519,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5054,6 +5055,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5773,6 +5775,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index b83fcd481..4fb10c77a 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3497,6 +3497,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -5030,6 +5031,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5749,6 +5751,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 5e30602fe..c1f48c4e8 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3464,6 +3464,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4983,6 +4984,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5702,6 +5704,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 4727c7c20..6ddb55d38 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3442,6 +3442,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4959,6 +4960,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5678,6 +5680,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 472b512da..dca2c0648 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -3463,6 +3463,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4982,6 +4983,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5701,6 +5703,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 8bd3fc39c..21536ee7b 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -3441,6 +3441,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4958,6 +4959,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5677,6 +5679,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 09e88ce36..b77b2925b 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3391,6 +3391,7 @@ CONFIG_NR_CPUS=64 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4875,6 +4876,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -5594,6 +5596,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y diff --git a/kernel-s390x.config b/kernel-s390x.config index d03379c43..050d4f20f 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3369,6 +3369,7 @@ CONFIG_NR_CPUS=64 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4851,6 +4852,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -5570,6 +5572,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index c54e5e7ef..f124e7135 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3732,6 +3732,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NTB_AMD=m +CONFIG_NTB_IDT=m CONFIG_NTB_INTEL=m CONFIG_NTB=m CONFIG_NTB_NETDEV=m @@ -5302,6 +5303,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set @@ -6038,6 +6040,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4a6f3132b..c8ed2cccb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3712,6 +3712,7 @@ CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m CONFIG_NTB_AMD=m +CONFIG_NTB_IDT=m CONFIG_NTB_INTEL=m CONFIG_NTB=m CONFIG_NTB_NETDEV=m @@ -5280,6 +5281,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -6016,6 +6018,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/kernel.spec b/kernel.spec index e36a67292..7d93fe3c3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # The git snapshot level -%define gitrev 8 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -620,9 +620,9 @@ Patch502: CVE-2017-7477.patch # Below patches are submitted upstream, awaiting review / merging Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch Patch611: 0011-Input-goodix-Add-support-for-capacitive-home-button.patch -Patch612: 0012-Input-gpio_keys-Do-not-report-wake-button-presses-as.patch +# This either needs to be removed or rebased +# Patch612: 0012-Input-gpio_keys-Do-not-report-wake-button-presses-as.patch Patch613: 0013-iio-accel-bmc150-Add-support-for-BOSC0200-ACPI-devic.patch -Patch614: 0014-mmc-sdhci-acpi-Workaround-conflict-with-PCI-wifi-on-.patch Patch615: 0015-i2c-cht-wc-Add-Intel-Cherry-Trail-Whiskey-Cove-SMBUS.patch # Small workaround patches for issues with a more comprehensive fix in -next Patch616: 0016-Input-silead-Do-not-try-to-directly-access-the-GPIO-.patch @@ -2180,6 +2180,9 @@ fi # # %changelog +* Mon Jul 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc1.git0.1 +- Linux v4.13-rc1 + * Mon Jul 17 2017 Laura Abbott <labbott@fedoraproject.org> - Disable debugging options. @@ -1,3 +1,3 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 -SHA512 (patch-4.12-git8.xz) = cb6c8450d2e219738fa23816780d75b942a316a186aa75ff7e6f9e425e4d07e2adb676dd1a2e44381620f3df8acf520af9095173260c8be74c9b54180f3be7f3 +SHA512 (patch-4.13-rc1.xz) = fd569384a68a9e4831249900826fb39032ab3790cdcc0955b83120c2d289ed14eaba6e43093837061040b60839fe4c9a02f8e48bc52b134037a38bbd951a1d4a |