[vserver] linux 3.10.21 and patch-3.10.19-vs2.3.6.8.diff

applying patch-3.10.19-vs2.3.6.8.diff to linux-3.10.21 fails:

patching file ipc/shm.c
Hunk #2 FAILED at 210.
Hunk #3 FAILED at 219.
Hunk #4 succeeded at 499 (offset 3 lines).
Hunk #5 succeeded at 576 (offset 3 lines).
2 out of 5 hunks FAILED -- saving rejects to file ipc/shm.c.rej

the failure is due to this commit in 3.10.21:

http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=b444df2f5791fb1ddf7d6b771ee32e30cc29dad9

the attached patch fixes the failure (and Makefile's EXTRAVERSION, too).

instructions:
1. download linux-3.10.21 (or patch linux-3.10.20, etc)
2. apply patch-3.10.19-vs2.3.6.8.diff
3. apply the attached patch-3.10.19-21-vs2.3.6.8.diff

i've built and tested the resulting kernel against testme.sh and testfs.sh in
virtualbox (and will put into production in 24 hours if no bugs are reported
in linux-3.10.21).

corey

--
undefined@pobox.com