diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-16 07:31:34 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-16 07:31:34 +0100 |
commit | 8d532137b10f3712f1d335a497432d901bc9afdb (patch) | |
tree | a78d9f58a5b15d902e7bfb42bbc6272edaca13f2 | |
parent | 7a32163cb2233d817d73edcb3c03d8a8b3074957 (diff) | |
parent | f43646ce1aae0ecb06518dcdcb267398c9303427 (diff) | |
download | kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc26.tar.gz kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc26.tar.xz kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc26.zip |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc26kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc25kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc24
-rw-r--r-- | baseconfig/CONFIG_PWRSEQ_EMMC | 2 | ||||
-rw-r--r-- | baseconfig/CONFIG_PWRSEQ_SIMPLE | 2 | ||||
-rw-r--r-- | baseconfig/CONFIG_TIMER_STATS | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 6 | ||||
-rw-r--r-- | kernel-aarch64.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl.config | 6 | ||||
-rw-r--r-- | kernel-i686-PAE.config | 6 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 6 | ||||
-rw-r--r-- | kernel-i686-debug.config | 6 | ||||
-rw-r--r-- | kernel-i686.config | 6 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 6 | ||||
-rw-r--r-- | kernel-ppc64.config | 6 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 6 | ||||
-rw-r--r-- | kernel-ppc64le.config | 6 | ||||
-rw-r--r-- | kernel-ppc64p7-debug.config | 6 | ||||
-rw-r--r-- | kernel-ppc64p7.config | 6 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 6 | ||||
-rw-r--r-- | kernel-s390x.config | 6 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 6 | ||||
-rw-r--r-- | kernel-x86_64.config | 6 | ||||
-rw-r--r-- | kernel.spec | 11 |
24 files changed, 72 insertions, 65 deletions
diff --git a/baseconfig/CONFIG_PWRSEQ_EMMC b/baseconfig/CONFIG_PWRSEQ_EMMC index 4f3ddc111..995df8828 100644 --- a/baseconfig/CONFIG_PWRSEQ_EMMC +++ b/baseconfig/CONFIG_PWRSEQ_EMMC @@ -1 +1 @@ -# CONFIG_PWRSEQ_EMMC is not set +CONFIG_PWRSEQ_EMMC=m diff --git a/baseconfig/CONFIG_PWRSEQ_SIMPLE b/baseconfig/CONFIG_PWRSEQ_SIMPLE index b15e391d3..e03b57d1e 100644 --- a/baseconfig/CONFIG_PWRSEQ_SIMPLE +++ b/baseconfig/CONFIG_PWRSEQ_SIMPLE @@ -1 +1 @@ -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_SIMPLE=m diff --git a/baseconfig/CONFIG_TIMER_STATS b/baseconfig/CONFIG_TIMER_STATS index 71a68f162..0dfc820be 100644 --- a/baseconfig/CONFIG_TIMER_STATS +++ b/baseconfig/CONFIG_TIMER_STATS @@ -1 +1 @@ -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 7526300f3..f1f65d0f0 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4024,8 +4024,8 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y @@ -5365,7 +5365,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 8f5b7cd60..1195fdda0 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4002,8 +4002,8 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_BAM_DMA=y @@ -5342,7 +5342,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a346a7938..14d69b6d3 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4365,8 +4365,8 @@ CONFIG_PWM_TIPWMSS=y CONFIG_PWM_TWL_LED=m CONFIG_PWM_TWL=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m @@ -5889,7 +5889,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index b250ca889..ef4179471 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4142,8 +4142,8 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5535,7 +5535,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TI_MESSAGE_MANAGER=m CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 8057d5d49..89d6015d5 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4121,8 +4121,8 @@ CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TEGRA=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5513,7 +5513,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TI_MESSAGE_MANAGER=m CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e971cc899..2f6979473 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4344,8 +4344,8 @@ CONFIG_PWM_TIPWMSS=y CONFIG_PWM_TWL_LED=m CONFIG_PWM_TWL=m CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m CONFIG_PXA_DMA=y # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m @@ -5867,7 +5867,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 0f1b6fb5b..5f996ccb4 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3875,8 +3875,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5105,7 +5105,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 62886b151..35a7863da 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3895,8 +3895,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5126,7 +5126,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 6e5a684de..490f9ac26 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3895,8 +3895,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5126,7 +5126,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-i686.config b/kernel-i686.config index 0dffd51d6..c8dcfc858 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3875,8 +3875,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5105,7 +5105,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 414115223..318317a3f 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3761,8 +3761,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4965,7 +4965,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 9b1623c62..2cc4ad06a 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3739,8 +3739,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4942,7 +4942,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 14c3d83c6..ae87cf9f4 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3701,8 +3701,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4894,7 +4894,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index e565b2f54..48bee7544 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3679,8 +3679,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4871,7 +4871,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index d1cb17fb7..736b5a7c9 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -3700,8 +3700,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4893,7 +4893,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index a1f6c20f7..92abf2172 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -3678,8 +3678,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4870,7 +4870,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 61a9964a1..e2b8583e7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3590,8 +3590,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4786,7 +4786,7 @@ CONFIG_TIFM_7XX1=m # CONFIG_TIFM_CORE is not set CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 2743434dd..157774296 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3568,8 +3568,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4763,7 +4763,7 @@ CONFIG_TIFM_7XX1=m # CONFIG_TIFM_CORE is not set CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index be3f1db20..121f8efca 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3916,8 +3916,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5157,7 +5157,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index be6185d94..aefc4c930 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3896,8 +3896,8 @@ CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -5136,7 +5136,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y diff --git a/kernel.spec b/kernel.spec index 631fa5940..73df37049 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -2196,6 +2196,13 @@ fi # # %changelog +* Wed Feb 15 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable PWRSEQ_SIMPLE module (fixes rhbz 1377816) + +* Tue Feb 14 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git0.2 +- Reenable debugging options. +- CVE-2017-5967 Disable CONFIG_TIMER_STATS (rhbz 1422138 1422140) + * Mon Feb 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc8.git0.1 - Disable debugging options. - Linux v4.10-rc8 |