diff options
18 files changed, 14 insertions, 18 deletions
diff --git a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM b/baseconfig/arm/CONFIG_PATA_OF_PLATFORM deleted file mode 100644 index 5354705f9..000000000 --- a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PATA_OF_PLATFORM=m diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA b/baseconfig/arm/CONFIG_USB_CHIPIDEA index 0b76e3525..0b76e3525 100644 --- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA +++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST index 1c14a4a6c..1c14a4a6c 100644 --- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST +++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC index 320052607..320052607 100644 --- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC +++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI index d1a5cf9eb..d1a5cf9eb 100644 --- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI +++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA deleted file mode 100644 index 0b76e3525..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_CHIPIDEA=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST deleted file mode 100644 index 1c14a4a6c..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_CHIPIDEA_HOST=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC deleted file mode 100644 index 320052607..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_CHIPIDEA_UDC=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI deleted file mode 100644 index d1a5cf9eb..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_CHIPIDEA_ULPI=y @@ -1 +1 @@ -dc972a67cc54585bd83ad811c4e9b6ab3dcd427e +9cd6681cb1169e815c41af0265165dd1b872f228 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index db89fd2dd..4fd0c0882 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3944,7 +3944,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 92ca930a2..5f05345de 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3923,7 +3923,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 4f07e53e7..577a4657b 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4234,7 +4234,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index bb0c4f2c9..081dc2f22 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4015,7 +4015,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m @@ -5955,8 +5954,10 @@ CONFIG_USB_BELKIN=y CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6fc6fa22b..74df8b400 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3994,7 +3994,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m @@ -5932,8 +5931,10 @@ CONFIG_USB_BELKIN=y CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b2671c8f5..6ffdc21fa 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4213,7 +4213,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m diff --git a/kernel.spec b/kernel.spec index a5b03c09c..a07787f56 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2216,6 +2216,9 @@ fi # # %changelog +* Thu Sep 28 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc2.git3.1 +- Linux v4.14-rc2-125-g9cd6681cb116 + * Wed Sep 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc2.git2.1 - Linux v4.14-rc2-48-gdc972a67cc54 @@ -1,4 +1,4 @@ SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03 SHA512 (patch-4.14-rc2.xz) = bfdf4ed88f7eeef35f723d886ea059a2fac69b7ea18313abe768d06674f6c36ca0579dd61170b9c91aeb7cc055af3c8330b15e092e8f4880ef6c8d93bd6cfa48 -SHA512 (patch-4.14-rc2-git2.xz) = 8b512dea4b32aaf617457a9d5bc6ff132fc27d1e21d499a64f646ecde94f26dd8e8579566e85eae49be565fb8bd0127a13743337aee822d642661c2536422cf1 +SHA512 (patch-4.14-rc2-git3.xz) = 888a3c3756350af4d308c158598b73589b381bbbb1e0018d336bf4c196d336deed95dcffce9867484449b2fda0f442e4163eef08fd1d25a0720bc3f3b0ee23b8 |