summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-03-31 14:08:03 -0700
committerJohn Schoenick2020-03-31 14:08:03 -0700
commitaf8666569ed57b9470006097ba49f07011c27ba6 (patch)
tree855d2e9524bfc3f25e49f63cb454d4c266dd4d70
parentc4860564c727e5bc716e498faf81847d6dfca19e (diff)
parent26d9104497f2a5042a4b8e280b5fda1c99fba297 (diff)
downloadaur-af8666569ed57b9470006097ba49f07011c27ba6.tar.gz
Merge branch 'upstream' for 5.5.13
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--config16
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a422a419db..43b7da715f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.5.10.arch1
+ pkgver = 5.5.13.arch2
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.5.10-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.5.13-arch2
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.10-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.5.13-arch2
source = config
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868
+ sha256sums = 0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
pkgname = linux-fsync
diff --git a/PKGBUILD b/PKGBUILD
index 47d89cc735f..cd67b6d3833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.5.10.arch1
+pkgver=5.5.13.arch2
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -26,7 +26,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868'
+ '0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index d21a0453eb4..b7064b1a4f2 100644
--- a/config
+++ b/config
@@ -1,13 +1,13 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.5.5-arch1 Kernel Configuration
+# Linux/x86 5.5.13-arch2 Kernel Configuration
#
#
-# Compiler: gcc (GCC) 9.2.0
+# Compiler: gcc (Arch Linux 9.3.0-1) 9.3.0
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=90300
CONFIG_CLANG_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
@@ -2553,9 +2553,9 @@ CONFIG_HAVE_IDE=y
#
# SCSI device support
#
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
+CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y
@@ -2563,7 +2563,7 @@ CONFIG_SCSI_PROC_FS=y
#
# SCSI support type (disk, tape, CD-ROM)
#
-CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=m
CONFIG_BLK_DEV_SR_VENDOR=y
@@ -2705,7 +2705,7 @@ CONFIG_SCSI_DH_EMC=m
CONFIG_SCSI_DH_ALUA=m
# end of SCSI device support
-CONFIG_ATA=m
+CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
CONFIG_SATA_ZPODD=y
@@ -2714,7 +2714,7 @@ CONFIG_SATA_PMP=y
#
# Controllers with non-SFF native interface
#
-CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI=y
CONFIG_SATA_MOBILE_LPM_POLICY=3
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_CEVA=m