Subject: Re: [vserver] linux 3.10.(5[56789]|6[01]) and patch-3.10.53-vs2.3.6.8.diff
From: Corey Wright <undefined@pobox.com>
Date: Sun, 7 Dec 2014 15:26:50 -0600

same email thread, but reducing quoted portions...

applying patch-3.10.53-vs2.3.6.8.diff to linux 3.10.(5[567]|6[012]) fails in
both patching and testing/functionality.

> the upstream addition of including "linux/hash.h" in "fs/namei.c" [1]
> invalidated the patch hunk context.
> 
> patching file fs/namei.c
> Hunk #1 FAILED at 34.
> Hunk #2 succeeded at 267 (offset 1 line).
> Hunk #3 succeeded at 473 (offset 1 line).
> Hunk #4 succeeded at 1327 (offset 1 line).
> Hunk #5 succeeded at 1473 (offset 1 line).
> Hunk #6 succeeded at 1506 (offset 1 line).
> 1 out of 16 hunks FAILED -- saving rejects to file fs/namei.c.rej
> 
> [1] https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=d4c96061fddd129778ce8b70fb093aa532f422d0
> 
> the upstream change of masking all capabilities above CAP_LAST_CAP (which the
> linux-vserver patch does not adjust to account for its own CAP_CONTEXT)
> breaks changing/manipulating contexts.
> 
> # vserver-info | grep V
> 
> Assumed 'SYSINFO' as no other option given; try '--help' for more information.
> Versions:
>                    VS-API: ???
>                       VCI: ???
> # chcontext --xid 1 -- true
> chcontext: vc_new_s_context(): Function not implemented
> 
> [2] https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=76f01555c78e496203105bd29b878db3431a2260

the below referenced patches account for the change in patch hunk context and
the masking of CAP_CONTEXT.

1. acquire linux-3.10.62
2. apply patch-3.10.53-vs2.3.6.8
3. apply patch-3.10.53-55-vs2.3.6.8.diff [0]
4. apply patch-3.10.53-56-vs2.3.6.9.diff [1]
5. manually fix the Makefile reject (EXTRAVERSION)

[0]
http://archives.linux-vserver.org/201409/att-0005/patch-3.10.53-55-vs2.3.6.8.diff
[1]
http://archives.linux-vserver.org/201410/att-0015/patch-3.10.53-56-vs2.3.6.9.diff

i've successfully built the resulting kernel and tested it in virtualbox
against testme.sh and testfs.sh, and started-entered-exited-stopped a vserver
guest.

corey
--
undefined@pobox.com