summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--config.sp311
3 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cb5cacd8efb..927e208cd220 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-surfacepro3-git
- pkgver = 4.18rc5.r0.g9d3cce1e8b8561fed5
+ pkgver = 4.18rc6.r152.gcd3f77d74ac31b4627
pkgrel = 1
url = http://www.kernel.org/
arch = i686
@@ -26,7 +26,7 @@ pkgbase = linux-surfacepro3-git
sha256sums = 31d109a2f5864d865b3ce3c310158b2e9ae77f9c424f2af5a7e45548d62a2eb3
sha256sums = becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc
sha256sums = 56152d1f7cac31d0a9a7414e950106c3945d5de8d50bc75cf7385fa46078b1de
- sha256sums = 40d59b597b766f868cb38b7d97128f14a3a391379745aadba1685485997ac408
+ sha256sums = 6ce53380096c4a24adf868b96edcf77db42443cd98477930476b7921f11f07cc
sha256sums = 82f1b3fd8d59ca406225c9915e3799d9bafad440a211eb50fcca0cefbb8ecb2a
sha256sums = 28ccd02a460f65af19655d505e3fb37a12497093d70da06f58f5084c0fa1ebd9
sha256sums = 1778e4076654d857e994062c0f92fa3528bae5595d235ec8b51f55f7c14b036b
diff --git a/PKGBUILD b/PKGBUILD
index e086746d82ad..3627996dfeeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=linux-surfacepro3-git
_srcname=linux
-pkgver=4.18rc5.r0.g9d3cce1e8b8561fed5
+pkgver=4.18rc6.r152.gcd3f77d74ac31b4627
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -23,7 +23,7 @@ sha256sums=('SKIP'
'31d109a2f5864d865b3ce3c310158b2e9ae77f9c424f2af5a7e45548d62a2eb3'
'becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc'
'56152d1f7cac31d0a9a7414e950106c3945d5de8d50bc75cf7385fa46078b1de'
- '40d59b597b766f868cb38b7d97128f14a3a391379745aadba1685485997ac408'
+ '6ce53380096c4a24adf868b96edcf77db42443cd98477930476b7921f11f07cc'
'82f1b3fd8d59ca406225c9915e3799d9bafad440a211eb50fcca0cefbb8ecb2a'
'28ccd02a460f65af19655d505e3fb37a12497093d70da06f58f5084c0fa1ebd9'
'1778e4076654d857e994062c0f92fa3528bae5595d235ec8b51f55f7c14b036b'
diff --git a/config.sp3 b/config.sp3
index 8eed9f572dfc..17be0dd2b6dd 100644
--- a/config.sp3
+++ b/config.sp3
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.0-rc5 Kernel Configuration
+# Linux/x86 4.18.0-rc6 Kernel Configuration
#
#
@@ -266,7 +266,7 @@ CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SLAB_FREELIST_HARDENED=y
# CONFIG_SLUB_CPU_PARTIAL is not set
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
@@ -330,7 +330,8 @@ CONFIG_GCC_PLUGINS=y
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-# CONFIG_STACKPROTECTOR is not set
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -1137,13 +1138,11 @@ CONFIG_NF_NAT_REDIRECT=y
CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_OSF=m
CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m
-CONFIG_NFT_SET_RBTREE=m
-CONFIG_NFT_SET_HASH=m
-CONFIG_NFT_SET_BITMAP=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m