summaryrefslogtreecommitdiff
path: root/PATCHCFG
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-03-30 10:38:41 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-03-30 10:38:41 -0300
commitcc23ca504e54659c24f0663a7b9221db21bd8fb2 (patch)
treeb4714aa745baaa0c1d3df6b0753893632c76aabb /PATCHCFG
parent09dff2df680bf245e0f7e5d881ba48593789f46a (diff)
parent97bebf5280f46a97cdfbb4238d2a89f4b67073d6 (diff)
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts: PATCHCFG
Diffstat (limited to 'PATCHCFG')
-rw-r--r--PATCHCFG19
1 files changed, 10 insertions, 9 deletions
diff --git a/PATCHCFG b/PATCHCFG
index ea8f226..f527f92 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -1,7 +1,7 @@
# Kernel source file
-SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38-libre/linux-2.6.38-libre.tar.bz2"
+SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38.1-libre/linux-2.6.38.1-libre.tar.bz2"
# Original source directory
-SRCORIG="linux-2.6.38"
+SRCORIG="linux-2.6.38.1"
# Our source directory
SRCNAME="linux-2.6.38-LIBRE"
# Patches:
@@ -9,23 +9,24 @@ SRCNAME="linux-2.6.38-LIBRE"
# or
# filename%patchlevel (file must be in patches/ subdirectory)
PATCHES=(
- # add upstream patch from 2.6.37 series
- #ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.38.1.bz2%1
-
- # add latest fixes from stable queue, if needed
- # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- 2.6.38.1-pre.patch%1
# fix #19234 i1915 display size
fix-i915.patch%1
+ # fix #23390 radeon kms
+ radeon-kms-sanity-checks.patch%1
+
+ # fix i915 pipelining glitches
+ # https://bugs.freedesktop.org/show_bug.cgi?id=34584
+ i915-pipeline.patch%1
+
# add aufs2 support, in reference to:
# http://aufs.sourceforge.net
aufs2-base-20110314.patch%1
aufs2-standalone-20110314.patch%1
)
# Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.38-2-LIBRE"
+PATCHNAME="patch-2.6.38.1-LIBRE"
# Run this before applying patches
pre_apply() {