# HG changeset patch # User Pascal Bellard # Date 1387363454 0 # Node ID 8580e54b52849e1b21372b5ebb3ebe3182ba20e9 # Parent eb689de65d7eeca0e5d670f3be5338cacb1e49ad Up linux (3.2.53) again... diff -r eb689de65d7e -r 8580e54b5284 linux/receipt --- a/linux/receipt Wed Dec 18 08:40:48 2013 +0000 +++ b/linux/receipt Wed Dec 18 10:44:14 2013 +0000 @@ -135,7 +135,6 @@ $PACKAGE-diff.u $PACKAGE-header.u $PACKAGE-freeinitrd.u -$PACKAGE-core.u $PACKAGE-subroot.u aufs3-base.patch aufs3-standalone.patch diff -r eb689de65d7e -r 8580e54b5284 linux/stuff/linux-diff.u --- a/linux/stuff/linux-diff.u Wed Dec 18 08:40:48 2013 +0000 +++ b/linux/stuff/linux-diff.u Wed Dec 18 10:44:14 2013 +0000 @@ -1,6 +1,6 @@ ---- linux-2.6.30.6/arch/x86/vdso/Makefile -+++ linux-2.6.30.6/arch/x86/vdso/Makefile -@@ -104,10 +104,12 @@ +--- linux-3.2.53/arch/x86/vdso/Makefile ++++ linux-3.2.53/arch/x86/vdso/Makefile +@@ -118,10 +118,12 @@ $(foreach H,$(filter-out FORCE,$^),\ if grep -q VDSO32_SYSENTER_RETURN $H; \ then diff -u $(@D)/.tmp_$(@F) $H; \ @@ -17,9 +17,9 @@ endef ---- linux-2.6.34/scripts/Makefile.lib -+++ linux-2.6.34/scripts/Makefile.lib -@@ -204,7 +204,8 @@ +--- linux-3.2.53/scripts/Makefile.lib ++++ linux-3.2.53/scripts/Makefile.lib +@@ -239,7 +239,8 @@ # --------------------------------------------------------------------------- quiet_cmd_gzip = GZIP $@ @@ -28,7 +28,7 @@ + ( which advdef > /dev/null && advdef -z $@ ; true ) || \ (rm -f $@ ; false) - + # DTC @@ -253,7 +254,7 @@ quiet_cmd_lzma = LZMA $@ @@ -37,4 +37,4 @@ + xz -z -e --format=lzma --lzma1=mode=normal --stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ (rm -f $@ ; false) - quiet_cmd_lzo = LZO $@ + quiet_cmd_lzo = LZO $@ diff -r eb689de65d7e -r 8580e54b5284 linux/stuff/linux-freeinitrd.u --- a/linux/stuff/linux-freeinitrd.u Wed Dec 18 08:40:48 2013 +0000 +++ b/linux/stuff/linux-freeinitrd.u Wed Dec 18 10:44:14 2013 +0000 @@ -1,6 +1,6 @@ ---- linux-3.2.14/arch/x86/mm/init.c -+++ linux-3.2.14/arch/x86/mm/init.c -@@ -358,7 +358,7 @@ +--- linux-3.2.53/arch/x86/mm/init.c ++++ linux-3.2.53/arch/x86/mm/init.c +@@ -372,7 +372,7 @@ set_memory_nx(begin, (end - begin) >> PAGE_SHIFT); set_memory_rw(begin, (end - begin) >> PAGE_SHIFT); diff -r eb689de65d7e -r 8580e54b5284 linux/stuff/linux-subroot.u --- a/linux/stuff/linux-subroot.u Wed Dec 18 08:40:48 2013 +0000 +++ b/linux/stuff/linux-subroot.u Wed Dec 18 10:44:14 2013 +0000 @@ -6,9 +6,9 @@ ... The bad news : you can't remount / ---- linux-3.2.40/Documentation/kernel-parameters.txt -+++ linux-3.2.40/Documentation/kernel-parameters.txt -@@ -2304,8 +2304,9 @@ +--- linux-3.2.53/Documentation/kernel-parameters.txt ++++ linux-3.2.53/Documentation/kernel-parameters.txt +@@ -2324,8 +2324,9 @@ ro [KNL] Mount root device read-only on boot