From 88372c915ebd2a31111f2d112347215128eb59b7 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 18 Feb 2020 09:47:46 -0500 Subject: Linux v5.6-rc2-8-gb1da3acc781c Also enable CONFIG_INET_ESPINTCP (rhbz 1804255) --- configs/fedora/generic/CONFIG_INET_ESPINTCP | 2 +- gitrev | 2 +- kernel-aarch64-debug-fedora.config | 3 +-- kernel-aarch64-fedora.config | 3 +-- kernel-armv7hl-debug-fedora.config | 3 +-- kernel-armv7hl-fedora.config | 3 +-- kernel-armv7hl-lpae-debug-fedora.config | 3 +-- kernel-armv7hl-lpae-fedora.config | 3 +-- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 6 +++++- sources | 1 + 18 files changed, 22 insertions(+), 23 deletions(-) diff --git a/configs/fedora/generic/CONFIG_INET_ESPINTCP b/configs/fedora/generic/CONFIG_INET_ESPINTCP index 04ac14c89..ebf9d9fe6 100644 --- a/configs/fedora/generic/CONFIG_INET_ESPINTCP +++ b/configs/fedora/generic/CONFIG_INET_ESPINTCP @@ -1 +1 @@ -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y diff --git a/gitrev b/gitrev index 20c214af3..ae633a5c5 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -b19e8c68470385dd2c5440876591fddb02c8c402 +b1da3acc781ce445445d959b41064d209a27bc2d diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ed5b77334..4f7d8b02e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2573,7 +2573,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -4921,7 +4921,6 @@ CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMH=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index ad35c999d..5cc1bd740 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2557,7 +2557,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -4900,7 +4900,6 @@ CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMH=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f2a084adb..70355c239 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2580,7 +2580,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -5002,7 +5002,6 @@ CONFIG_QCOM_PM=y CONFIG_QCOM_QFPROM=m CONFIG_QCOM_RMTFS_MEM=m # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SMD_RPM=m # CONFIG_QCOM_SMEM is not set CONFIG_QCOM_SMP2P=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 87d41c31c..42e3056f7 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2565,7 +2565,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -4982,7 +4982,6 @@ CONFIG_QCOM_PM=y CONFIG_QCOM_QFPROM=m CONFIG_QCOM_RMTFS_MEM=m # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SMD_RPM=m # CONFIG_QCOM_SMEM is not set CONFIG_QCOM_SMP2P=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 771b321f4..d8d046638 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2520,7 +2520,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -4856,7 +4856,6 @@ CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_RMTFS_MEM=m # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SOCINFO=m CONFIG_QCOM_SPMI_ADC5=m CONFIG_QCS_GCC_404=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ff29be1bc..074f62d34 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2505,7 +2505,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m @@ -4836,7 +4836,6 @@ CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_RMTFS_MEM=m # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set -CONFIG_QCOM_SCM=y CONFIG_QCOM_SOCINFO=m CONFIG_QCOM_SPMI_ADC5=m CONFIG_QCS_GCC_404=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index c6899eb13..4036ceb27 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2260,7 +2260,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 14176ec04..8544266ca 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2243,7 +2243,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 03be79632..d0f35835b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2062,7 +2062,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index a6a3c82c3..5f55cb70e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2045,7 +2045,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e217008c8..0ede3f850 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2040,7 +2040,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 95cad0802..eb10a5135 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2023,7 +2023,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 061b483ee..f881412e6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2299,7 +2299,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d65a8dbac..8453c588d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2282,7 +2282,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m -# CONFIG_INET_ESPINTCP is not set +CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m diff --git a/kernel.spec b/kernel.spec index ca5cba06b..2c39e1147 100644 --- a/kernel.spec +++ b/kernel.spec @@ -109,7 +109,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2896,6 +2896,10 @@ fi # # %changelog +* Tue Feb 18 2020 Jeremy Cline - 5.6.0-0.rc2.git1.1 +- Linux v5.6-rc2-8-gb1da3acc781c +- Enable CONFIG_INET_ESPINTCP (rhbz 1804255) + * Tue Feb 18 2020 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index 714106749..1d7a55fcf 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 SHA512 (patch-5.6-rc2.xz) = b49dfa43e7dcdf90bd68e582eb676f3cac53f7212d8abde6e41e18f8bd0eecc3ae2384639f8aaef8925c8e4385e75b0b49ec54e5bcfc23dec5fe2169cbce1af2 +SHA512 (patch-5.6-rc2-git1.xz) = ead71bb0efb09750beee0d3880571673f5d9063909aec055f8ab9158142ea2764d7faf421290090bdc2f7304375d08cd98d930be7db6ebff12569d0ec73495d4 -- cgit