01/01: gnu: linux-libre: Update to 4.0.2.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit aa2e989e1e6d480e964b08a3395c1d7aa704e392
Author: Mark H Weaver <address@hidden>
Date:   Thu May 7 18:40:15 2015 -0400

    gnu: linux-libre: Update to 4.0.2.
    
    * gnu/packages/patches/linux-libre-libreboot-fix.patch: Remove file.
    * gnu-system.am (dist_patch_DATA): Remove it.
    * gnu/packages/linux.scm (linux-libre): Update to 4.0.2.  Remove patch.
---
 gnu-system.am                                      |    1 -
 gnu/packages/linux.scm                             |    6 +--
 .../patches/linux-libre-libreboot-fix.patch        |   37 --------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 817bad7..95378a7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -472,7 +472,6 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/libvpx-fix-armhf-link.patch             \
   gnu/packages/patches/libvpx-fix-ssse3-quantize.patch         \
   gnu/packages/patches/libvpx-vp9-out-of-bounds-access.patch   \
-  gnu/packages/patches/linux-libre-libreboot-fix.patch         \
   gnu/packages/patches/lirc-localstatedir.patch                        \
   gnu/packages/patches/lm-sensors-hwmon-attrs.patch            \
   gnu/packages/patches/lua51-liblua-so.patch                    \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 62d2777..5da3979 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -200,7 +200,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
      #f)))
 
 (define-public linux-libre
-  (let* ((version "4.0.1")
+  (let* ((version "4.0.2")
          (build-phase
           '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
              ;; Apply the neat patch.
@@ -273,9 +273,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
              (uri (linux-libre-urls version))
              (sha256
               (base32
-               "1d5r26fh7dpdckvxfyn69r72h02yvri92rcmi2r658k56snsxs2k"))
-             (patches
-              (list (search-patch "linux-libre-libreboot-fix.patch")))))
+               "18iyp2hzzb00jy389prp0lmby0i32qlbxjn74r4msmfra9s0w8mp"))))
     (build-system gnu-build-system)
     (native-inputs `(("perl" ,perl)
                      ("bc" ,bc)
diff --git a/gnu/packages/patches/linux-libre-libreboot-fix.patch 
b/gnu/packages/patches/linux-libre-libreboot-fix.patch
deleted file mode 100644
index d340a99..0000000
--- a/gnu/packages/patches/linux-libre-libreboot-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This patch fixes linux-libre-3.19.x on Libreboot X60 machines.
-Copied from https://bugzilla.kernel.org/show_bug.cgi?id=93171#c25
-
---- a/drivers/gpu/drm/i915/i915_irq.c  
-+++ a/drivers/gpu/drm/i915/i915_irq.c  
-@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev)
-               ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-                 I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
-                 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
--                I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
--                I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
-+                I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
-       I915_WRITE16(IMR, dev_priv->irq_mask);
- 
-       I915_WRITE16(IER,
-                    I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-                    I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
--                   I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT |
-                    I915_USER_INTERRUPT);
-       POSTING_READ16(IER);
- 
-@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev)
-                 I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-                 I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
-                 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
--                I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
--                I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
-+                I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
- 
-       enable_mask =
-               I915_ASLE_INTERRUPT |
-               I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-               I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
--              I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT |
-               I915_USER_INTERRUPT;
- 
-       if (I915_HAS_HOTPLUG(dev)) {