From 604324c6c0349db28db88c8db20f33974e94e577 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 10 Apr 2015 02:15:25 -0300
Subject: linux-libre-{pae,xen}-3.19.3_gnu-3: fix btrfs deadlock on mount and
 kernel panic on shutdown for intel graphics card users

---
 kernels/linux-libre-xen/PKGBUILD | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'kernels/linux-libre-xen/PKGBUILD')

diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 14b6e9902..a7428abd6 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -18,7 +18,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1.1
+pkgrel=3
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -34,6 +34,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         'linux.preset'
         'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
         'change-default-console-loglevel.patch'
+        '0001-fix-btrfs-mount-deadlock.patch'
+        '0001-fixup-drm.patch'
         '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch')
 sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             'SKIP'
@@ -45,6 +47,8 @@ sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            '5967cf53cb9db9f070e8f346c3d7045748e4823a7fe2ee330acd18c9d02bbb77'
+            '911872ef7000af471e649aaeb3490094a0b4c1514ca1024757ca2e90ac1d2a3d'
             '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -75,6 +79,13 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix #44495 and #44385 deadlock on btrfs mount
+  # https://btrfs.wiki.kernel.org/index.php/Gotchas
+  patch -Np1 -i "${srcdir}/0001-fix-btrfs-mount-deadlock.patch"
+
+  # fix #44491
+  patch -Np1 -i "${srcdir}/0001-fixup-drm.patch"
+
   # drm/i915: Stop gathering error states for CS error interrupts
   # https://bugzilla.kernel.org/show_bug.cgi?id=93171
   patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch"
-- 
cgit v1.2.3-54-g00ecf