diff options
29 files changed, 40 insertions, 37 deletions
diff --git a/configs/fedora/generic/CONFIG_CC_STACKPROTECTOR_STRONG b/configs/fedora/generic/CONFIG_CC_STACKPROTECTOR_STRONG deleted file mode 100644 index e0779fa1d..000000000 --- a/configs/fedora/generic/CONFIG_CC_STACKPROTECTOR_STRONG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CC_STACKPROTECTOR_STRONG is not set diff --git a/configs/fedora/generic/CONFIG_STACKPROTECTOR_STRONG b/configs/fedora/generic/CONFIG_STACKPROTECTOR_STRONG new file mode 100644 index 000000000..94e471e9e --- /dev/null +++ b/configs/fedora/generic/CONFIG_STACKPROTECTOR_STRONG @@ -0,0 +1 @@ +# CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/configs/fedora/generic/arm/CONFIG_CC_STACKPROTECTOR b/configs/fedora/generic/arm/CONFIG_CC_STACKPROTECTOR deleted file mode 100644 index 66c3e10d9..000000000 --- a/configs/fedora/generic/arm/CONFIG_CC_STACKPROTECTOR +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CC_STACKPROTECTOR is not set diff --git a/configs/fedora/generic/arm/CONFIG_STACKPROTECTOR b/configs/fedora/generic/arm/CONFIG_STACKPROTECTOR new file mode 100644 index 000000000..f914fa9b5 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_STACKPROTECTOR @@ -0,0 +1 @@ +# CONFIG_STACKPROTECTOR is not set diff --git a/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR b/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR deleted file mode 100644 index ffba31f93..000000000 --- a/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CC_STACKPROTECTOR=y diff --git a/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR_STRONG b/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR_STRONG deleted file mode 100644 index ce5cb4d04..000000000 --- a/configs/fedora/generic/x86/CONFIG_CC_STACKPROTECTOR_STRONG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CC_STACKPROTECTOR_STRONG=y diff --git a/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR b/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR new file mode 100644 index 000000000..b5942a551 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR @@ -0,0 +1 @@ +CONFIG_STACKPROTECTOR=y diff --git a/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG b/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG new file mode 100644 index 000000000..6c885445e --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_STACKPROTECTOR_STRONG @@ -0,0 +1 @@ +CONFIG_STACKPROTECTOR_STRONG=y @@ -1 +1 @@ -be779f03d563981c65cc7417cc5e0dbbc5b89d30 +2837461dbe6f4a9acc0d86f88825888109211c99 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index adace21bd..e5bbf8438 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -830,10 +830,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5892,6 +5890,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index abe46bac5..7cf2325e9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -830,10 +830,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5868,6 +5866,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a5c52f219..3c1f539cc 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -867,10 +867,8 @@ CONFIG_CB710_CORE=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -6325,6 +6323,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index c91840295..a0a904b9c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -841,10 +841,8 @@ CONFIG_CB710_CORE=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5933,6 +5931,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 75f9f67f5..c6bf5c278 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -840,10 +840,8 @@ CONFIG_CB710_CORE=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5909,6 +5907,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 63d361ba6..34b856578 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -866,10 +866,8 @@ CONFIG_CB710_CORE=m CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CCS811 is not set # CONFIG_CC_STACKPROTECTOR_AUTO is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -6301,6 +6299,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index b52536412..21c1cae5e 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -709,8 +709,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5525,6 +5523,8 @@ CONFIG_SSB_SDIOHOST=y CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 81d602b42..d98dfab3c 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -712,8 +712,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5550,6 +5548,8 @@ CONFIG_SSB_SDIOHOST=y CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 9bdef8840..4c3720cc6 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -712,8 +712,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5550,6 +5548,8 @@ CONFIG_SSB_SDIOHOST=y CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-i686.config b/kernel-i686.config index f58803618..fab21e4b0 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -709,8 +709,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5525,6 +5523,8 @@ CONFIG_SSB_SDIOHOST=y CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 4c74f4063..e3d49b0df 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -698,7 +698,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5318,6 +5317,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 7c49fe715..2b3053154 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -695,7 +695,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5291,6 +5290,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 3734c0915..8576415e1 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -654,7 +654,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5245,6 +5244,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index e260709c8..36ab4aa15 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -651,7 +651,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5218,6 +5217,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index c01f7229f..8fe1ab8c9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -652,7 +652,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CCW_CONSOLE=y CONFIG_CCWGROUP=m CONFIG_CCW=y @@ -5139,6 +5138,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSFDC is not set CONFIG_STACK_GUARD=256 +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index e608451bf..a6bae416d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -649,7 +649,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_CCW_CONSOLE=y CONFIG_CCWGROUP=m CONFIG_CCW=y @@ -5112,6 +5111,7 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSFDC is not set CONFIG_STACK_GUARD=256 +# CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index cc27a1df6..cb733402c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -725,8 +725,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5636,6 +5634,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 54372cd10..0427ab72d 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -722,8 +722,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_STACKPROTECTOR_AUTO is not set # CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -5611,6 +5609,8 @@ CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set CONFIG_SSB=y # CONFIG_SSFDC is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACKPROTECTOR=y CONFIG_STACK_TRACER=y CONFIG_STACK_VALIDATION=y # CONFIG_STAGING_BOARD is not set diff --git a/kernel.spec b/kernel.spec index 03e9bc4a6..307bfed5e 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 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1839,6 +1839,9 @@ fi # # %changelog +* Thu Jun 14 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git9.1 +- Linux v4.17-11928-g2837461dbe6f + * Wed Jun 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git8.1 - Linux v4.17-11782-gbe779f03d563 @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.17-git8.xz) = 6e8f3ee0536d5c4250b7709a7c67f918721da75f7afbbf205c5af5a33bd350f0ad95e0a30d5a06f852e381dd13a89101344364463ee6c1004c308acdb6cf0329 +SHA512 (patch-4.17-git9.xz) = 945b5eb0345aae1a3f44118e38a579dcbfd9e67d35080a658707af4e16956b647a8d283f5f990867ca7e09b699d9e0ed9f0e4b9c173154d2aca32b7f6f58c812 |