diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-15 07:23:09 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-15 07:23:09 +0200 |
commit | 1ddf5a3ca9524870e68910e8f6785581f2955152 (patch) | |
tree | 8b51a986db0bd2b73e682e6ae8b7e55a12a70c3f | |
parent | 426af3611edfb7a96e386d4e994c7e652d7998a2 (diff) | |
parent | cc77719c1de4aeb841b98fcc07e407884941626f (diff) | |
download | kernel-1ddf5a3ca9524870e68910e8f6785581f2955152.tar.gz kernel-1ddf5a3ca9524870e68910e8f6785581f2955152.tar.xz kernel-1ddf5a3ca9524870e68910e8f6785581f2955152.zip |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc23
-rw-r--r-- | config-arm-generic | 1 | ||||
-rw-r--r-- | config-arm64 | 1 | ||||
-rw-r--r-- | config-armv7 | 1 | ||||
-rw-r--r-- | config-generic | 1 | ||||
-rw-r--r-- | config-x86-generic | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 10 | ||||
-rw-r--r-- | sources | 2 |
8 files changed, 16 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic index edef2881e..3daa40baa 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -317,6 +317,7 @@ CONFIG_DEVFREQ_THERMAL=y CONFIG_SPMI=m CONFIG_MFD_SPMI_PMIC=m CONFIG_REGMAP_SPMI=m +# CONFIG_QORIQ_THERMAL is not set # Device tree CONFIG_DTC=y diff --git a/config-arm64 b/config-arm64 index 38b16dbab..24f217834 100644 --- a/config-arm64 +++ b/config-arm64 @@ -274,6 +274,7 @@ CONFIG_QCOM_COINCELL=m # CONFIG_QCOM_Q6V5_PIL is not set # CONFIG_QCOM_WCNSS_PIL is not set # CONFIG_QCOM_EBI2 is not set +# CONFIG_QCOM_TSENS is not set # mvebu # CONFIG_MV_XOR_V2 is not set diff --git a/config-armv7 b/config-armv7 index dcd611b71..31439c029 100644 --- a/config-armv7 +++ b/config-armv7 @@ -353,6 +353,7 @@ CONFIG_MTD_NAND_QCOM=m # CONFIG_QCOM_Q6V5_PIL is not set # CONFIG_MSM_IOMMU is not set # CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_QCOM_TSENS is not set # i.MX # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-generic b/config-generic index 774afefba..75696f5af 100644 --- a/config-generic +++ b/config-generic @@ -3247,6 +3247,7 @@ CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_SYSFS=y # CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_SOFT_WATCHDOG=m CONFIG_WDAT_WDT=m CONFIG_WDTPCI=m diff --git a/config-x86-generic b/config-x86-generic index 6d476f2a6..2c377bf84 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -154,6 +154,8 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y CONFIG_VMD=m +CONFIG_INTEL_BXT_PMIC_THERMAL=m + CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -1 +1 @@ -1573d2caf713874cfe0d1336c823d0fb548d8bed +29fbff8698fc0ac1a1d74584b258e0bf18b469f9 diff --git a/kernel.spec b/kernel.spec index 6cb507619..bd3a6046c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 7 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1600,7 +1600,7 @@ BuildKernel() { # Go back and find all of the various directories in the tree. We use this # for the dir lists in kernel-core - find lib/modules/$KernelVer/kernel -type d | sort -n > module-dirs.list + find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n > module-dirs.list # Cleanup rm System.map @@ -2162,6 +2162,12 @@ fi # # %changelog +* Fri Oct 14 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git9.1 +- Linux v4.8-14604-g29fbff8 + +* Thu Oct 13 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git8.1 +- Linux v4.8-14230-gb67be92 + * Wed Oct 12 2016 Laura Abbott <labbott@redhat.com> - Add script to remove binary diffs @@ -1,3 +1,3 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz -7fb93297f4f69e1f2b563bec1f0951f0 patch-4.8-git7.xz +e1029b94d3c299991f7103373ee1f090 patch-4.8-git9.xz |