Re: [vserver] linux 3.14.2[23456] and patch-3.14.17-vs2.3.6.13.diff

same email thread, but reducing quoted portions...

applying patch-3.14.17-vs2.3.6.13.diff to linux 3.14.2[23456] 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.
>
> [1]
> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?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/?id=76f01555c78e496203105bd29b878db3431a2260
>
> the upstream addition of including "net/ipv6.h" in "drivers/net/tun.c" [3]
> invalidated the patch hunk context.
>
> patching file drivers/net/tun.c
> Hunk #1 FAILED at 65.
> Hunk #2 succeeded at 171 (offset 1 line).
> Hunk #3 succeeded at 405 (offset 1 line).
> Hunk #4 succeeded at 1431 (offset 12 lines).
> Hunk #5 succeeded at 1648 (offset 12 lines).
> Hunk #6 succeeded at 2014 (offset 7 lines).
> 1 out of 6 hunks FAILED -- saving rejects to file drivers/net/tun.c.rej
>
> [3]
> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=63de6fcc826404270c6c576381fd3ad92fd807f9

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

1. acquire 3.14.26
2. apply patch-3.14.17-vs2.3.6.13.diff
3. apply patch-3.14.17-19-include_hash-vs2.3.6.13.diff [1]
4. apply patch-3.14.17-19-remove_caps-vs2.3.6.13.diff [2]
5. apply patch-3.14.17-24-include_ipv6-vs2.3.6.13.diff [3]
6. manually fix the Makefile reject (EXTRAVERSION)

[1]
http://archives.linux-vserver.org/201410/att-0050/patch-3.14.17-19-include_hash-vs2.3.6.13.diff
[2]
http://archives.linux-vserver.org/201410/att-0050/patch-3.14.17-19-remove_caps-vs2.3.6.13.diff
[3]
http://archives.linux-vserver.org/201411/att-0002/patch-3.14.17-24-include_ipv6-vs2.3.6.13.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