diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-10 13:06:28 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-10 13:06:28 +0000 |
| commit | b564ab6807cc8133142c88cb180e4784881e95cf (patch) | |
| tree | 31493fbdebd363de855438cdba1e06b8ecf57eaa /core/linux-lts | |
| parent | 9f07f8e51f08a85c000ed48c7d3e72f38f17c818 (diff) | |
| parent | 21ae949aaf08083cbae30d64ee1650adccc365dd (diff) | |
| download | packages-b564ab6807cc8133142c88cb180e4784881e95cf.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core/linux-lts')
| -rw-r--r-- | core/linux-lts/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/linux-lts/config | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index 69bb8d85..e0cd2b31 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -2,7 +2,7 @@ # fail if upstream's .config changes if [ "${sha256sums[4]}" = 'c645053c4525a1a70d5c10b52257ac136da7e9059b6a4a566a857a3d42046426' ]; then - sha256sums[4]='93082396973984f8cdb0fb5b05ba9e50f35ebd4d766e2aadfd5a69acce1cfab1' + sha256sums[4]='15ac94245d0de07d062665cc14169151179049948119f92949e3bd0fbdb4af41' fi eval "$( diff --git a/core/linux-lts/config b/core/linux-lts/config index a7349a67..0eb4661b 100644 --- a/core/linux-lts/config +++ b/core/linux-lts/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.39 Kernel Configuration +# Linux/x86 4.14.61-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -36,6 +36,7 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y +CONFIG_X86_32_LAZY_GS=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=2 @@ -299,10 +300,10 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y # CONFIG_GCC_PLUGINS is not set CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE 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=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_THIN_ARCHIVES=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -1312,6 +1313,9 @@ CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1319,10 +1323,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -8520,7 +8521,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m |