diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-22 10:34:16 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-22 10:38:01 +0100 |
| commit | a48860184a282f2a4b5e7f363fe173e5a25264fd (patch) | |
| tree | 2346151a068341a599f1c719dd7ca3bd39ea1e02 /main | |
| parent | 07536cbc5abf4d80f6b8728bf0ae0d6b2d97b9db (diff) | |
| download | aports-a48860184a282f2a4b5e7f363fe173e5a25264fd.tar.bz2 aports-a48860184a282f2a4b5e7f363fe173e5a25264fd.tar.xz | |
main/linux-vserver: upgrade to 3.0.14-vs2.3.2.1
Diffstat (limited to 'main')
| -rw-r--r-- | main/linux-vserver/APKBUILD | 6 | ||||
| -rw-r--r-- | main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff (renamed from main/linux-vserver/patch-3.0.13-vs2.3.2.1-unofficial.diff) | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 01a25307b9..a4d74c54d0 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=3.0.13 +pkgver=3.0.14 pkgrel=0 _vsver=vs2.3.2.1 @@ -132,7 +132,7 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -bf47382f0c923b8dc2b5e8e456c59cc9 patch-3.0.13.bz2 -d6a1a9fdbb78372dabda0b438aaedd45 patch-3.0.13-vs2.3.2.1-unofficial.diff +f2745bd4dcb3267414713adff403b54c patch-3.0.14.bz2 +7d49344644c0860707b9358bbb39768e patch-3.0.14-vs2.3.2.1-unofficial.diff 4baec73eeb0ddc1148d580a6d1e29b1f kernelconfig.x86 148b84ad28167290f2f7f0420945cb92 kernelconfig.x86_64" diff --git a/main/linux-vserver/patch-3.0.13-vs2.3.2.1-unofficial.diff b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff index 6025f17f3b..337cd011ef 100644 --- a/main/linux-vserver/patch-3.0.13-vs2.3.2.1-unofficial.diff +++ b/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff @@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.0.9/Makefile linux-3.0.9-vs2.3.2.1/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 - SUBLEVEL = 13 + SUBLEVEL = 14 -EXTRAVERSION = +EXTRAVERSION = -vs2.3.2.1 NAME = Sneaky Weasel @@ -3519,17 +3519,17 @@ diff -NurpP --minimal linux-3.0.9/fs/ext4/super.c linux-3.0.9-vs2.3.2.1/fs/ext4/ --- linux-3.0.9/fs/ext4/super.c 2011-11-15 16:40:46.000000000 +0100 +++ linux-3.0.9-vs2.3.2.1/fs/ext4/super.c 2011-08-31 19:37:44.000000000 +0200 @@ -1293,6 +1293,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, - Opt_discard, Opt_nodiscard, - Opt_init_inode_table, Opt_noinit_inode_table, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, + Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { @@ -1368,6 +1369,9 @@ static const match_table_t tokens = { - {Opt_init_inode_table, "init_itable=%u"}, - {Opt_init_inode_table, "init_itable"}, - {Opt_noinit_inode_table, "noinit_itable"}, + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, |