summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-04-21 11:45:19 -0700
committerJohn Schoenick2020-04-21 11:45:19 -0700
commitee997581d910199dbf274e9f53ccf34e8de9aafd (patch)
treedb6d3e20ccc9686edcac8f54a10e2b3ebbf67020
parentac78bc0532ca301ad9dbe357912ce0e0bbddd6ca (diff)
parentfb21ea2fc8f54c2fb6b453bcdadf089a8c38b594 (diff)
downloadaur-ee997581d910199dbf274e9f53ccf34e8de9aafd.tar.gz
Merge branch 'upstream' for 5.6.5
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--config4
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a2dfea60b4..0729911af4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.6.4.arch1
+ pkgver = 5.6.5.arch3
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.6.4-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.6.5-arch3
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.4-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.5-arch3
source = config
source = sphinx-workaround.patch
source = futex-wait-multiple-5.2.1.patch
@@ -23,7 +23,7 @@ pkgbase = linux-fsync
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = 6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c
+ sha256sums = dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
diff --git a/PKGBUILD b/PKGBUILD
index 43bc04e48c5..90bf20aa299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.6.4.arch1
+pkgver=5.6.5.arch3
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -27,7 +27,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c'
+ 'dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
diff --git a/config b/config
index 94cfc97455a..cfa5f4ea3e1 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.3-arch1 Kernel Configuration
+# Linux/x86 5.6.5-arch2 Kernel Configuration
#
#
@@ -4433,7 +4433,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
CONFIG_I2C_FSI=m
# end of I2C Hardware Bus support
-# CONFIG_I2C_STUB is not set
+CONFIG_I2C_STUB=m
CONFIG_I2C_SLAVE=y
CONFIG_I2C_SLAVE_EEPROM=m
# CONFIG_I2C_DEBUG_CORE is not set