summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-02-26 13:56:45 -0800
committerJohn Schoenick2020-02-26 13:56:55 -0800
commit04108f5b1c9856ea2d25b9333c78c0a406988591 (patch)
tree16f67a2d92f996531ab8f95475bc6175bb9a65fb
parentb2a2397998de64b5ec80d9997200752c78429a19 (diff)
parent7c98be276fc75357905be35b378affac3383ba98 (diff)
downloadaur-04108f5b1c9856ea2d25b9333c78c0a406988591.tar.gz
Merge branch 'upstream' for 5.5.6
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD7
-rw-r--r--config9
3 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6260a501e98..7964ffd8cd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.5.5.arch1
+ pkgver = 5.5.6.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.5.5-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.5.6-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,14 +15,14 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.5.5-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.5.6-arch1
source = config
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = d8ec5445fe03cd5e0cb95a8bcbdf4887a1649825b0a68b8ffd62dabe300ecb8f
+ sha256sums = a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
pkgname = linux-fsync
diff --git a/PKGBUILD b/PKGBUILD
index 2b9d6961100..fa761575530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.5.5.arch1
+pkgver=5.5.6.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -26,7 +26,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'd8ec5445fe03cd5e0cb95a8bcbdf4887a1649825b0a68b8ffd62dabe300ecb8f'
+ 'a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
export KBUILD_BUILD_HOST=archlinux
@@ -60,7 +60,8 @@ prepare() {
build() {
cd $_srcname
- make bzImage modules htmldocs
+ make all
+ make htmldocs
}
_package() {
diff --git a/config b/config
index 02abb3a6d4b..d21a0453eb4 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.5.4-arch1 Kernel Configuration
+# Linux/x86 5.5.5-arch1 Kernel Configuration
#
#
@@ -10350,8 +10350,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_10x18 is not set
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_TER16x32 is not set
-CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_TER16x32=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_MEMREGION=y
@@ -10421,7 +10420,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