diff options
| -rw-r--r-- | baseconfig/CONFIG_CLK_HSDK | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-aarch64.config | 1 | ||||
| -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 | 1 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 1 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 1 | ||||
| -rw-r--r-- | kernel-i686.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 1 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 1 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 1 | ||||
| -rw-r--r-- | kernel-s390x.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 1 | ||||
| -rw-r--r-- | kernel-x86_64.config | 1 | ||||
| -rw-r--r-- | kernel.spec | 5 |
26 files changed, 37 insertions, 2 deletions
diff --git a/baseconfig/CONFIG_CLK_HSDK b/baseconfig/CONFIG_CLK_HSDK new file mode 100644 index 000000000..e1788bbc5 --- /dev/null +++ b/baseconfig/CONFIG_CLK_HSDK @@ -0,0 +1 @@ +# CONFIG_CLK_HSDK is not set diff --git a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS b/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS new file mode 100644 index 000000000..213edb5a1 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS @@ -0,0 +1 @@ +# CONFIG_USB_CONFIGFS_F_LB_SS is not set diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU b/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU new file mode 100644 index 000000000..3b2ba681a --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU @@ -0,0 +1 @@ +CONFIG_SUN4I_A10_CCU=y diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU new file mode 100644 index 000000000..149900927 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU @@ -0,0 +1 @@ +CONFIG_SUN8I_R40_CCU=y @@ -1 +1 @@ -6d8ef53e8b2fed8b0f91df0c6da7cc92747d934a +46c1e79fee417f151547aa46fae04ab06cb666f4 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 7a3c6974f..394710fe1 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -854,6 +854,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index f6af49b2d..b378b9730 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -854,6 +854,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a8716fe97..5d78d222d 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -899,6 +899,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y @@ -5980,6 +5981,7 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_ST_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=m # CONFIG_ST_THERMAL_SYSCFG is not set +CONFIG_SUN4I_A10_CCU=y CONFIG_SUN4I_EMAC=m CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y @@ -5989,6 +5991,7 @@ CONFIG_SUN8I_A33_CCU=y # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_DE2_CCU is not set CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R40_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 9db88a9aa..428e841be 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -872,6 +872,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y @@ -5581,6 +5582,7 @@ CONFIG_STRICT_MODULE_RWX=y # CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set +CONFIG_SUN4I_A10_CCU=y CONFIG_SUN4I_EMAC=m CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y @@ -5590,6 +5592,7 @@ CONFIG_SUN8I_A33_CCU=y # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_DE2_CCU is not set CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R40_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 58012b823..53abb459b 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -871,6 +871,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y @@ -5558,6 +5559,7 @@ CONFIG_STRICT_MODULE_RWX=y # CONFIG_STRING_SELFTEST is not set CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set +CONFIG_SUN4I_A10_CCU=y CONFIG_SUN4I_EMAC=m CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y @@ -5567,6 +5569,7 @@ CONFIG_SUN8I_A33_CCU=y # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_DE2_CCU is not set CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R40_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 61f27754f..9f60d1ab2 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -898,6 +898,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y @@ -5957,6 +5958,7 @@ CONFIG_STRIP_ASM_SYMS=y CONFIG_ST_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=m # CONFIG_ST_THERMAL_SYSCFG is not set +CONFIG_SUN4I_A10_CCU=y CONFIG_SUN4I_EMAC=m CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y @@ -5966,6 +5968,7 @@ CONFIG_SUN8I_A33_CCU=y # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_DE2_CCU is not set CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_R40_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 0edbd0200..1a6f15594 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -753,6 +753,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index df2e8e582..723354136 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -754,6 +754,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index cbe3f8ee3..8517821d5 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -754,6 +754,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-i686.config b/kernel-i686.config index 8d6f24137..58ef108b4 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -753,6 +753,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9eda31d30..e48a7f486 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -738,6 +738,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 349dd6b2d..ee0039893 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -737,6 +737,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 1e22e0a90..5d1b63293 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -694,6 +694,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 6fc0d49e9..6cb35e167 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -693,6 +693,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index c4a1e1f65..195f1b2e7 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -694,6 +694,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index c55bbf5cc..b7250ff06 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -693,6 +693,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b9c4a9bcf..db042495c 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -696,6 +696,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 0f1c7b0f9..ef3e6d686 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -695,6 +695,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index b79e61f4b..e252a494d 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -768,6 +768,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index c609aa1ac..7b940e7fa 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -767,6 +767,7 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y +# CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLOCK_THERMAL is not set CONFIG_CLS_U32_MARK=y diff --git a/kernel.spec b/kernel.spec index 4cf18e4d8..44a1924f0 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 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2191,6 +2191,9 @@ fi # # %changelog +* Thu Sep 14 2017 Justin M. Forbes <jforbes@redhat.com> - 4.14.0-0.rc0.git6.1 +- Linux v4.13-11811-g46c1e79fee41 + * Wed Sep 13 2017 Justin M. Forbes <jforbes@redhat.com> - 4.14.0-0.rc0.git5.1 - Linux v4.13-11559-g6d8ef53e8b2f |