summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2019-08-08 13:40:46 +0800
committershmilee2019-08-08 13:40:46 +0800
commite5be467eafdf022c84e6bbad31041218d289c8a0 (patch)
tree7335b54ac3a38c7749b5d9d457db1f58bfba5f7c
parentee4587cf06d3f6ccf273e8c781fb4a961ea08e98 (diff)
downloadaur-e5be467eafdf022c84e6bbad31041218d289c8a0.tar.gz
update to LTS 4.19.64
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD14
-rw-r--r--config2
-rw-r--r--drm-i915-maintain-consistent-documentation-subsection-ordering.patch86
4 files changed, 10 insertions, 104 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a2ac98bf43d..9268db59282 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by makepkg 5.1.3
-# Tue Jun 11 05:04:45 UTC 2019
+# Thu Aug 8 05:24:41 UTC 2019
pkgbase = linux-shmilee
- pkgver = 4.19.49
+ pkgver = 4.19.64
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.49.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.64.xz
source = http://ck.kolivas.org/patches/4.0/4.19/4.19-ck1/patch-4.19-ck1.xz
source = ck-patch-for-4.19.7+.patch
source = ck-patch-for-4.19.33+.patch
@@ -24,7 +24,6 @@ pkgbase = linux-shmilee
source = https://raw.githubusercontent.com/dolohow/uksm/c4fc85e4e513f97c38806358c472cc45270d936f/uksm-4.19.patch
source = uksm-patch-for-4.19.37+.patch
source = linux-cjktty-4.19.patch::https://github.com/torvalds/linux/compare/v4.19...Gentoo-zh:4.19-utf8.patch
- source = drm-i915-maintain-consistent-documentation-subsection-ordering.patch
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -33,7 +32,7 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
sha256sums = SKIP
- sha256sums = 6db8a2cf4dd3808e4bcf47da5b434de78e2eadb367432db1c4709ac83910117a
+ sha256sums = dda154fabc35aa281be8a2bd772738ac2abe2656f890ce7f67729a82e6b85df7
sha256sums = 77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780
sha256sums = 58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa
sha256sums = fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1
@@ -41,8 +40,7 @@ pkgbase = linux-shmilee
sha256sums = ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653
sha256sums = fe32296cad05b08b34369ac49a226ae9591890fb106d0c6bc5b8f690f8d553b3
sha256sums = 72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3
- sha256sums = 0264c997a4193c7504f0c950373a96f8d0cb5e647bbb5df551ffc91566586b3f
- sha256sums = c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5
+ sha256sums = 2eb7ec27f3dea53b0aac9ad665195df63e03598a89b6dd1c00af8d2738be88df
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/PKGBUILD b/PKGBUILD
index 113bafd9d07..c5631bc2986 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
# https://www.kernel.org/category/releases.html
# 4.19 Greg Kroah-Hartman 2018-10-22 2020-12
_LLL_VER=4.19
-_LLL_SUBVER=49
+_LLL_SUBVER=64
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU can actually run slower with NUMA enabled.
@@ -36,9 +36,6 @@ _CJKTTY_PATCH="${_CJKTTY_PATCH_FILE}::${_CJKTTY_PATCH_URL}"
_PATHSET_DESC="ck${_CK_VER} uksm-${_UKSM_VER} and cjktty"
-# https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2021842.html
-_drm_i915_sphinx_v2_patch="drm-i915-maintain-consistent-documentation-subsection-ordering.patch"
-
pkgbase=linux-shmilee
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
_srcname=linux-${_LLL_VER}
@@ -61,7 +58,6 @@ source=(
${_UKSM_PATCH}
'uksm-patch-for-4.19.37+.patch'
${_CJKTTY_PATCH}
- "${_drm_i915_sphinx_v2_patch}"
'config' # the main kernel config file
'60-linux.hook' # pacman hook for depmod
'90-linux.hook' # pacman hook for initramfs regeneration
@@ -74,7 +70,7 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1'
'SKIP'
- '6db8a2cf4dd3808e4bcf47da5b434de78e2eadb367432db1c4709ac83910117a'
+ 'dda154fabc35aa281be8a2bd772738ac2abe2656f890ce7f67729a82e6b85df7'
'77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780'
'58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa'
'fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1'
@@ -82,8 +78,7 @@ sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1'
'ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653'
'fe32296cad05b08b34369ac49a226ae9591890fb106d0c6bc5b8f690f8d553b3'
'72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3'
- '0264c997a4193c7504f0c950373a96f8d0cb5e647bbb5df551ffc91566586b3f'
- 'c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5'
+ '2eb7ec27f3dea53b0aac9ad665195df63e03598a89b6dd1c00af8d2738be88df'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -118,9 +113,6 @@ prepare() {
cp "../${_CJKTTY_PATCH_FILE}" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
- msg "Patching source with Sphinx-2.0 Documentation build patch"
- patch -p1 -i ../${_drm_i915_sphinx_v2_patch}
-
cp -Tf ../config .config
if [ "${_kernelname}" != "" ]; then
diff --git a/config b/config
index d043da95ada..02293e11762 100644
--- a/config
+++ b/config
@@ -3188,6 +3188,7 @@ CONFIG_LED_TRIGGER_PHY=y
CONFIG_SFP=m
CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
CONFIG_ASIX_PHY=m
CONFIG_AT803X_PHY=m
CONFIG_BCM7XXX_PHY=m
@@ -6001,6 +6002,7 @@ CONFIG_CHASH=m
# CONFIG_CHASH_STATS is not set
# CONFIG_CHASH_SELFTEST is not set
CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
CONFIG_NOUVEAU_DEBUG=5
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_DEBUG_MMU is not set
diff --git a/drm-i915-maintain-consistent-documentation-subsection-ordering.patch b/drm-i915-maintain-consistent-documentation-subsection-ordering.patch
deleted file mode 100644
index 3382dff2767..00000000000
--- a/drm-i915-maintain-consistent-documentation-subsection-ordering.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 551bd3368a7b3cfef01edaade8970948d178d40a Mon Sep 17 00:00:00 2001
-From: Jonathan Corbet <corbet@lwn.net>
-Date: Thu, 23 May 2019 10:06:46 -0600
-Subject: drm/i915: Maintain consistent documentation subsection ordering
-
-From: Jonathan Corbet <corbet@lwn.net>
-
-commit 551bd3368a7b3cfef01edaade8970948d178d40a upstream.
-
-With Sphinx 2.0 (or prior versions with the deprecation warnings fixed) the
-docs build fails with:
-
- Documentation/gpu/i915.rst:403: WARNING: Title level inconsistent:
-
- Global GTT Fence Handling
- ~~~~~~~~~~~~~~~~~~~~~~~~~
-
- reST markup error:
- Documentation/gpu/i915.rst:403: (SEVERE/4) Title level inconsistent:
-
-I "fixed" it by changing the subsections in i915.rst, but that didn't seem
-like the correct change. It turns out that a couple of i915 files create
-their own subsections in kerneldoc comments using apostrophes as the
-heading marker:
-
- Layout
- ''''''
-
-That breaks the normal subsection marker ordering, and newer Sphinx is
-rather more strict about enforcing that ordering. So fix the offending
-comments to make Sphinx happy.
-
-(This is unfortunate, in that kerneldoc comments shouldn't need to be aware
-of where they might be included in the heading hierarchy, but I don't see
-a better way around it).
-
-Cc: stable@vger.kernel.org # v4.14+
-Acked-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/i915_reg.h | 6 +++---
- drivers/gpu/drm/i915/intel_workarounds.c | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -32,7 +32,7 @@
- * macros. Do **not** mass change existing definitions just to update the style.
- *
- * Layout
-- * ''''''
-+ * ~~~~~~
- *
- * Keep helper macros near the top. For example, _PIPE() and friends.
- *
-@@ -78,7 +78,7 @@
- * style. Use lower case in hexadecimal values.
- *
- * Naming
-- * ''''''
-+ * ~~~~~~
- *
- * Try to name registers according to the specs. If the register name changes in
- * the specs from platform to another, stick to the original name.
-@@ -96,7 +96,7 @@
- * suffix to the name. For example, ``_SKL`` or ``_GEN8``.
- *
- * Examples
-- * ''''''''
-+ * ~~~~~~~~
- *
- * (Note that the values in the example are indented using spaces instead of
- * TABs to avoid misalignment in generated documentation. Use TABs in the
---- a/drivers/gpu/drm/i915/intel_workarounds.c
-+++ b/drivers/gpu/drm/i915/intel_workarounds.c
-@@ -37,7 +37,7 @@
- * costly and simplifies things. We can revisit this in the future.
- *
- * Layout
-- * ''''''
-+ * ~~~~~~
- *
- * Keep things in this file ordered by WA type, as per the above (context, GT,
- * display, register whitelist, batchbuffer). Then, inside each type, keep the