summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-02-25 18:08:06 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2020-02-25 18:08:06 +0200
commit2d91d807c0b53171d64d03eb63cd24d4406b34bc (patch)
treebcbfd25b50a83e649a77fcdf1134753231d69a6c
parentMerge branch 'upstream' (diff)
parentUpdated to 5.5.6 (diff)
downloadlinux-ck-2d91d807c0b53171d64d03eb63cd24d4406b34bc.tar.xz
Merge branch 'upstream'
-rw-r--r--PKGBUILD6
-rw-r--r--config4
2 files changed, 6 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5e2c803..34cb9eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
pkgbase=linux-ck
_supver=5
_majver=5
-_minver=5
+_minver=6
_gccpatchver='20191217'
_gccpatchger='9.1'
_gccpatchker='5.5'
@@ -69,7 +69,7 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('7b0486c66f70dc58d84244810a8d7790a29c7a282b8e22585607bc87a98970dafba61c0894bcb523647b93b32e5511137cd350583b83715a15527dc02995d4a6'
+b2sums=('5af861196e6365c4ca00f658d8128455f0eb00cfd98ca7f7b37dcf5c962dd332f2a12b29a4bd0d13463c09573ccb97993129736dd2464bc03305583974546ab1'
'SKIP'
'4b982e16e3fee2c2c40db08d67a6cc794c27308c4b513a9baf909c5ea40e3be239288ba4c422e8eb58a669646d331e7fd945d7451d1a388f1c68fe3a445aa814'
'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e'
@@ -90,7 +90,7 @@ b2sums=('7b0486c66f70dc58d84244810a8d7790a29c7a282b8e22585607bc87a98970dafba61c0
'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
- '8313450831401b9fff8eb7a403bf3c2a652da6f48afebdaa040127c4292f346e930318848c8d20e70d0907f328db37a7321cb8d2b5c06b31b5cad01422e80039')
+ 'ed087b05d12bf5fcec63914e19e70f0caed5892645c0a35819f1b12a48b4e78236ebf060de4ed03eb20210182510d1e95385cdfcde6fe72d1c55db59c3f8968e')
#export KBUILD_BUILD_HOST=arc4linux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index f60ab4c..cda9f02 100644
--- a/config
+++ b/config
@@ -10053,7 +10053,9 @@ CONFIG_DEBUG_MISC=y
# CONFIG_PAGE_EXTENSION is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+CONFIG_PAGE_POISONING_ZERO=y
# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_OBJECTS is not set