Re: [vserver] linux 3.10.4[12] and patch-3.10.40-vs2.3.6.8.diff

On Sun, 1 Jun 2014 14:49:49 -0500
Corey Wright <undefined@pobox.com> wrote:

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

applying patch-3.10.40-vs2.3.6.8.diff also fails against linux-3.10.42 in the
same way.

> 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.

the previously attached patch continues to fix net/core/rtnetlink.c in
linux-3.10.42, but fails against Makefile (though no worse than
patch-3.10.40-vs2.3.6.8.diff ;-).

> 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

instructions:
1. acquire linux-3.10.42
2. apply patch-3.10.40-vs2.3.6.8.diff
3. apply the previously attached patch-3.10.40-41-vs2.3.6.8.diff
4. make Makefile changes manually

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

i've had 3.10.41 in production for nearly a week and 3.10.42 passes all the
basic tests (testm{me,fs}.sh in virtualbox) and is headed for production
(during next maintenance window).

herbert, the 3.10.41 i've been running for the last week also has the
tab-delimited-proc-status patch (ie delta-proc-feat01.diff) applied without
any negative side-effects that i've noticed.

corey

--
undefined@pobox.com