Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

[people/teissler/ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 1db66a57c57245d0316b986c385d0d878b4c678f..2c928094d3dae2f2ef8febef54678b3c27ce9db0 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER           = 3.2.25
+VER           = 3.2.27
 
 RPI_PATCHES = linux-3.2-bootc-f23da7f
 
@@ -75,7 +75,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = b663da3da2dfba70a2a2d0c7f5999423
+$(DL_FILE)_MD5                         = ba14821366a1c055bcd0fe210297d09b
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 5651c6411bb1cbdbfe4b2908c117aaf3
 
 install : $(TARGET)
@@ -111,6 +111,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
+       # Apply backported codel patches
+       cd $(DIR_APP) && cat $(DIR_SRC)/src/patches/linux-3.2-codel/*.patch | patch -Np1
+
        # Linux Intermediate Queueing Device
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-imq.patch