diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-11 09:54:57 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-11 09:54:57 -0500 |
commit | 6d0a2502c6753ab4a9ade6383048ee3b08ed33a3 (patch) | |
tree | b0cf0d244d3da638a00781510a7443e866fcc826 | |
parent | f2e7f266d74194ea0ca597e4d071cdade3867a4c (diff) | |
download | kernel-6d0a2502c6753ab4a9ade6383048ee3b08ed33a3.tar.gz kernel-6d0a2502c6753ab4a9ade6383048ee3b08ed33a3.tar.xz kernel-6d0a2502c6753ab4a9ade6383048ee3b08ed33a3.zip |
Linux v4.11-13167-g791a9a6
-rw-r--r-- | baseconfig/CONFIG_RTC_DRV_CPCAP | 1 | ||||
-rw-r--r-- | baseconfig/CONFIG_TEE | 1 | ||||
-rw-r--r-- | baseconfig/arm/CONFIG_SUN8I_R_CCU | 1 | ||||
-rw-r--r-- | baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
-rw-r--r-- | kernel-aarch64.config | 4 | ||||
-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 | 2 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
-rw-r--r-- | kernel-i686-debug.config | 2 | ||||
-rw-r--r-- | kernel-i686.config | 2 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel-ppc64p7-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64p7.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
-rw-r--r-- | kernel-x86_64.config | 2 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
27 files changed, 58 insertions, 6 deletions
diff --git a/baseconfig/CONFIG_RTC_DRV_CPCAP b/baseconfig/CONFIG_RTC_DRV_CPCAP new file mode 100644 index 000000000..1b1f9af60 --- /dev/null +++ b/baseconfig/CONFIG_RTC_DRV_CPCAP @@ -0,0 +1 @@ +# CONFIG_RTC_DRV_CPCAP is not set diff --git a/baseconfig/CONFIG_TEE b/baseconfig/CONFIG_TEE new file mode 100644 index 000000000..accc7a854 --- /dev/null +++ b/baseconfig/CONFIG_TEE @@ -0,0 +1 @@ +# CONFIG_TEE is not set diff --git a/baseconfig/arm/CONFIG_SUN8I_R_CCU b/baseconfig/arm/CONFIG_SUN8I_R_CCU new file mode 100644 index 000000000..0b88df0dc --- /dev/null +++ b/baseconfig/arm/CONFIG_SUN8I_R_CCU @@ -0,0 +1 @@ +CONFIG_SUN8I_R_CCU=y diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X new file mode 100644 index 000000000..18ddc0770 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X @@ -0,0 +1 @@ +CONFIG_COMMON_CLK_HI655X=m @@ -1 +1 @@ -56868a460b83c0f93d339256a81064d89aadae8e +791a9a666d1afe2603bcb2c6a4852d684e879252 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 6eecaffcd..4ef10cb6a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -871,6 +871,7 @@ CONFIG_COMMON_CLK_HI3519=m CONFIG_COMMON_CLK_HI3660=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y +CONFIG_COMMON_CLK_HI655X=m CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m @@ -4380,6 +4381,7 @@ CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5363,6 +5365,7 @@ CONFIG_SUN50I_A64_CCU=y # CONFIG_SUN8I_A23_CCU is not set # CONFIG_SUN8I_A33_CCU is not set # CONFIG_SUN8I_H3_CCU is not set +CONFIG_SUN8I_R_CCU=y # CONFIG_SUN8I_V3S_CCU is not set # CONFIG_SUN9I_A80_CCU is not set CONFIG_SUNDANCE=m @@ -5460,6 +5463,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 1cca492bf..3a1416fdb 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -871,6 +871,7 @@ CONFIG_COMMON_CLK_HI3519=m CONFIG_COMMON_CLK_HI3660=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y +CONFIG_COMMON_CLK_HI655X=m CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m @@ -4358,6 +4359,7 @@ CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5340,6 +5342,7 @@ CONFIG_SUN50I_A64_CCU=y # CONFIG_SUN8I_A23_CCU is not set # CONFIG_SUN8I_A33_CCU is not set # CONFIG_SUN8I_H3_CCU is not set +CONFIG_SUN8I_R_CCU=y # CONFIG_SUN8I_V3S_CCU is not set # CONFIG_SUN9I_A80_CCU is not set CONFIG_SUNDANCE=m @@ -5437,6 +5440,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 588f86c47..13f54c6ec 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4738,6 +4738,7 @@ CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DA9052=m CONFIG_RTC_DRV_DA9055=m CONFIG_RTC_DRV_DS1286=m @@ -5865,6 +5866,7 @@ CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUNDANCE=m @@ -5963,6 +5965,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 302b1826a..aa71caa00 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4464,6 +4464,7 @@ CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5485,6 +5486,7 @@ CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUNDANCE=m @@ -5584,6 +5586,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bcd3d6c30..0b2412cdb 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4442,6 +4442,7 @@ CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5462,6 +5463,7 @@ CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUNDANCE=m @@ -5561,6 +5563,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0d53b8e30..38fced71d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4716,6 +4716,7 @@ CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DA9052=m CONFIG_RTC_DRV_DA9055=m CONFIG_RTC_DRV_DS1286=m @@ -5842,6 +5843,7 @@ CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUNDANCE=m @@ -5940,6 +5942,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m +# CONFIG_TEE is not set CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index f94fd59bd..c09f3b023 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4136,6 +4136,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5169,6 +5170,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 9a4d607a7..916d9c792 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4157,6 +4157,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5191,6 +5192,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 1ffd4c5f3..14f354b45 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4157,6 +4157,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5191,6 +5192,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-i686.config b/kernel-i686.config index dc7687a15..1730e3ab8 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4136,6 +4136,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5169,6 +5170,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index f2c419b16..0b760328e 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3982,6 +3982,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4991,6 +4992,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index d1b038bcd..bba8e9c1f 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3959,6 +3959,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4967,6 +4968,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index ce20590ca..c777e582e 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3922,6 +3922,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4920,6 +4921,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 527c85bac..7725491cb 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3899,6 +3899,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4896,6 +4897,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index c1f1a8ea4..c40442734 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -3921,6 +3921,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4919,6 +4920,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 0a7a986fb..408206bac 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -3898,6 +3898,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4895,6 +4896,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index cc5ab5778..26f8d7182 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3811,6 +3811,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4812,6 +4813,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 7630497d2..0f77a1f3a 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3788,6 +3788,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -4788,6 +4789,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 33df38f4e..e7ceb596f 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4179,6 +4179,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5222,6 +5223,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ee975d50f..4a52f9f7d 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4158,6 +4158,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_CPCAP is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m @@ -5200,6 +5201,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set +# CONFIG_TEE is not set CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m diff --git a/kernel.spec b/kernel.spec index b8856800c..3aab134d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 7 +%define gitrev 8 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -589,9 +589,6 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch # Patch503: drm-i915-turn-off-wc-mmaps.patch -# CVE-2017-7645 rhbz 1443615 1443617 -Patch667: CVE-2017-7645.patch - # CVE-2017-7477 rhbz 1445207 1445208 Patch668: CVE-2017-7477.patch @@ -2170,6 +2167,9 @@ fi # # %changelog +* Thu May 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git8.1 +- Linux v4.11-13167-g791a9a6 + * Wed May 10 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git7.1 - Linux v4.11-12441-g56868a4 @@ -1,3 +1,3 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 -SHA512 (patch-4.11-git7.xz) = 735f8f58a60f04e7be122c75cf9e9f37422b7ca734ad671a56db759d849431be2e59d827e458aa97f4d13d31acf4ba3c3f127ba94f59b1677eea791e3115155a +SHA512 (patch-4.11-git8.xz) = fd1a247a29f73ebd408cef1c41f923ac5a92062e9dae3e8fdffb964cd96936fac823273455a7c2669ffec0edecd4df6ebb9f379f693dfe8867b900b2c6a187f4 |