From b771fbdd6999a17aff103c8203025c5046278cfe Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 29 Sep 2017 15:33:41 -0500 Subject: [PATCH] Linux v4.14-rc2-201-g35dbba31be52 --- baseconfig/CONFIG_CRYPTO_GCM | 2 +- baseconfig/CONFIG_CRYPTO_GHASH | 2 +- baseconfig/arm/CONFIG_CRYPTO_GCM | 1 + baseconfig/arm/CONFIG_CRYPTO_GHASH | 1 + gitrev | 2 +- kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 4 ++-- kernel-armv7hl-lpae-debug.config | 4 ++-- kernel-armv7hl-lpae.config | 4 ++-- kernel-armv7hl.config | 4 ++-- kernel-i686-PAE.config | 4 ++-- kernel-i686-PAEdebug.config | 4 ++-- kernel-i686-debug.config | 4 ++-- kernel-i686.config | 4 ++-- kernel-ppc64-debug.config | 4 ++-- kernel-ppc64.config | 4 ++-- kernel-ppc64le-debug.config | 4 ++-- kernel-ppc64le.config | 4 ++-- kernel-ppc64p7-debug.config | 4 ++-- kernel-ppc64p7.config | 4 ++-- kernel-s390x-debug.config | 4 ++-- kernel-s390x.config | 4 ++-- kernel-x86_64-debug.config | 4 ++-- kernel-x86_64.config | 4 ++-- kernel.spec | 5 ++++- sources | 2 +- 27 files changed, 50 insertions(+), 45 deletions(-) create mode 100644 baseconfig/arm/CONFIG_CRYPTO_GCM create mode 100644 baseconfig/arm/CONFIG_CRYPTO_GHASH diff --git a/baseconfig/CONFIG_CRYPTO_GCM b/baseconfig/CONFIG_CRYPTO_GCM index 0cb7edc79..8b509be56 100644 --- a/baseconfig/CONFIG_CRYPTO_GCM +++ b/baseconfig/CONFIG_CRYPTO_GCM @@ -1 +1 @@ -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y diff --git a/baseconfig/CONFIG_CRYPTO_GHASH b/baseconfig/CONFIG_CRYPTO_GHASH index b94cd971d..2104f2f02 100644 --- a/baseconfig/CONFIG_CRYPTO_GHASH +++ b/baseconfig/CONFIG_CRYPTO_GHASH @@ -1 +1 @@ -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y diff --git a/baseconfig/arm/CONFIG_CRYPTO_GCM b/baseconfig/arm/CONFIG_CRYPTO_GCM new file mode 100644 index 000000000..8b509be56 --- /dev/null +++ b/baseconfig/arm/CONFIG_CRYPTO_GCM @@ -0,0 +1 @@ +CONFIG_CRYPTO_GCM=y diff --git a/baseconfig/arm/CONFIG_CRYPTO_GHASH b/baseconfig/arm/CONFIG_CRYPTO_GHASH new file mode 100644 index 000000000..2104f2f02 --- /dev/null +++ b/baseconfig/arm/CONFIG_CRYPTO_GHASH @@ -0,0 +1 @@ +CONFIG_CRYPTO_GHASH=y diff --git a/gitrev b/gitrev index f9d4bcc9e..021680cf7 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -9cd6681cb1169e815c41af0265165dd1b872f228 +35dbba31be52c59a89bd96d49f170999d57c9234 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4fd0c0882..ec2501a96 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1022,11 +1022,11 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM64_CE=m CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 5f05345de..88020bd4a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1021,11 +1021,11 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM64_CE=m CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 577a4657b..83e61e8fd 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1077,10 +1077,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 081dc2f22..6d6f3172a 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1024,10 +1024,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 74df8b400..45a7786c0 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1022,10 +1022,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 6ffdc21fa..f5ce570a7 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1075,10 +1075,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 236f86527..e008c0ee9 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -881,9 +881,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 8ae3ea67c..7e61aa61c 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -883,9 +883,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index e531214dc..f4e4e6aa6 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -883,9 +883,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-i686.config b/kernel-i686.config index 998e41462..406b38eb8 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -881,9 +881,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index dfbb87650..6808066ac 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -864,9 +864,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 0f7cf5296..8f0828e45 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -862,9 +862,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 65be21b1c..f6eab4842 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -818,9 +818,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 5df5817ae..43df9a5d0 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -816,9 +816,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 6d0f0debb..b30d3e097 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -818,9 +818,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 6aa361fbc..ba010db2f 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -816,9 +816,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b2784f833..9b5f0cc46 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -812,10 +812,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_GHASH_S390=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 71ad0cd51..21532691a 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -810,10 +810,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_GHASH_S390=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 93bba8f83..541508c47 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -909,10 +909,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index c94975f12..5602cefce 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -907,10 +907,10 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m diff --git a/kernel.spec b/kernel.spec index cc18fd94e..576f8124b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2196,6 +2196,9 @@ fi # # %changelog +* Fri Sep 29 2017 Justin M. Forbes - 4.14.0-0.rc2.git4.1 +- Linux v4.14-rc2-201-g35dbba31be52 + * Thu Sep 28 2017 Justin M. Forbes - 4.14.0-0.rc2.git3.1 - Linux v4.14-rc2-125-g9cd6681cb116 diff --git a/sources b/sources index b71a42049..30c94d6c3 100644 --- a/sources +++ b/sources @@ -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-git3.xz) = 888a3c3756350af4d308c158598b73589b381bbbb1e0018d336bf4c196d336deed95dcffce9867484449b2fda0f442e4163eef08fd1d25a0720bc3f3b0ee23b8 +SHA512 (patch-4.14-rc2-git4.xz) = b47426edf6dbc246299ae80f5309e3be246a8728cb73a0dce65d222e4184ea0f84eedea4877d9b2ae684ebe601ae3f99af8edf4ce5a6de373e561f6a3b76af14