applying patch-3.14.33-vs2.3.6.15.diff to linux 3.14.40 fails in patching.
patching file fs/libfs.c
Hunk #1 FAILED at 145.
Hunk #2 FAILED at 159.
2 out of 3 hunks FAILED -- saving rejects to file fs/libfs.c.rej
upstream commit
http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/fs/libfs.c?h=linux-3.14.y&id=5c48ea64a86415fde0859267a194442d26d2e70c
invalidated the patch hunk contexts.
the attached patch accounts for the upstream change.
instructions:
1. acquire linux-3.14.40
2. apply patch-3.14.33-vs2.3.6.15.diff
4. manually fix the Makefile reject (EXTRAVERSION)
3. apply the attached patch-3.14.33-40-vs2.3.6.15.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.
the vserver patch hunks that failed (and that i subsequently provided a new
patch for) appears related to filtering of pts in /dev/pts, so i tested that
only the relevant pts appear in each context (host and guests), but i
encourage further review and testing.
corey
-- undefined@pobox.com