[vserver] linux 3.10.41 and patch-3.10.40-vs2.3.6.8.diff

From: Corey Wright <undefined_at_pobox.com>
Date: Sun 01 Jun 2014 - 20:49:49 BST
Message-Id: <20140601144949.9526c04fbe34fedb4909ea83@pobox.com>

applying patch-3.10.40-vs2.3.6.8.diff to linux-3.10.41 fails.

the upstream change of saving an return/error code to a local variable (for
more elaborate testing in later statements) instead of testing it within a
conditional [1] invalidates a patch context and causes the patch hunk to fail.

patching file net/core/rtnetlink.c
Hunk #1 FAILED at 1059.
Hunk #2 succeeded at 1962 (offset 11 lines).
1 out of 2 hunks FAILED -- saving rejects to file net/core/rtnetlink.c.rej

[1]
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=1ab27dd7edb75bc3034daab503a912647bdf95ba

the attached patch corrects the patch context, but doesn't change the
linux-vserver logic, and fixes Makefile's EXTRAVERSION, too.

instructions:
1. acquire linux-3.10.41
2. apply patch-3.10.40-vs2.3.6.8.diff
3. apply the attached patch-3.10.40-41-vs2.3.6.8.diff

i've successfully built the resulting kernel and tested it against testme.sh
and testfs.sh in virtualbox.

corey

--
undefined@pobox.com

Received on Sun Jun 1 20:49:02 2014
[Next/Previous Months] [Main vserver Project Homepage] [Howto Subscribe/Unsubscribe] [Paul Sladen's vserver stuff]
Generated on Sun 01 Jun 2014 - 20:49:02 BST by hypermail 2.1.8