summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-07-18 19:54:57 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-07-18 19:54:57 +0000
commitc8f517f9495cc5cac5c7b081a5faac6851efec32 (patch)
tree18e472e9462ecd63f0b4f4afd937726390dd64ae /core
parent374ad657bbabdd5fa109ace3aa73926a91b3c9fb (diff)
parentd516581ef278b49536a43d8de664d50197280ead (diff)
downloadpackages-c8f517f9495cc5cac5c7b081a5faac6851efec32.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'core')
-rw-r--r--core/linux/PKGBUILD2
-rw-r--r--core/linux/config3
2 files changed, 3 insertions, 2 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 3b6010f6..d7591b31 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -2,7 +2,7 @@
# fail if upstream's .config changes
if [ "${sha256sums[4]}" = 'f8e890eac9779a89009c1e2339f757e9781864df09805211fad005146fe2578b' ]; then
- sha256sums[4]='6666e6530aac487c28c454c39021ce066b367f540448b4a4f17bfa0df480b824'
+ sha256sums[4]='20be3e13eb124181a502c1b69614077b40826a6305e63774b6e9d03071d51dd5'
fi
eval "$(
diff --git a/core/linux/config b/core/linux/config
index 5569797d..46159c16 100644
--- a/core/linux/config
+++ b/core/linux/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.8-1 Kernel Configuration
+# Linux/x86 4.17.6-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -9360,6 +9360,7 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
+# CONFIG_CRYPTO_SALSA20_586 is not set
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m