[vserver] linux 3.10.83 and patch-3.10.69-vs2.3.6.9.diff

From: Corey Wright <undefined_at_pobox.com>
Date: Sat 04 Jul 2015 - 19:12:41 BST
Message-Id: <20150704131241.76c6c2b7a1f2dbf1150e9d6f@pobox.com>

applying patch-3.10.69-vs2.3.6.9.diff to linux 3.10.83 fails in patching (in
addition to the patch failure that was previously introduced with linux
3.10.76 [1][2]).

patching file fs/file_table.c
Hunk #2 succeeded at 139 (offset -3 lines).
Hunk #3 succeeded at 258 (offset -3 lines).
Hunk #4 FAILED at 351.
1 out of 4 hunks FAILED -- saving rejects to file fs/file_table.c.rej

upstream commit
removed a source code line and invalidated the patch hunk context.

the attached patch accounts for the upstream change.

1. acquire linux-3.10.76
2. apply patch-3.10.69-vs2.3.6.9.diff
3. manually fix the Makefile reject (EXTRAVERSION)
4. apply patch-3.10.69-76-vs2.3.6.9.diff [3]
4. apply the attached patch-3.10.69-83-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, though i encourage the community to review and test.

[1] http://list.linux-vserver.org/archive?mss:6946:201504:hollohhekngigfmegnhk
[2] http://archives.linux-vserver.org/201504/0012.html



Received on Sat Jul 4 19:11:21 2015
[Next/Previous Months] [Main vserver Project Homepage] [Howto Subscribe/Unsubscribe] [Paul Sladen's vserver stuff]
Generated on Sat 04 Jul 2015 - 19:11:21 BST by hypermail 2.1.8