On 01/06/14 21:49, Corey Wright wrote:
> applying patch-3.10.40-vs188.8.131.52.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  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
> the attached patch corrects the patch context, but doesn't change the
> linux-vserver logic, and fixes Makefile's EXTRAVERSION, too.
> 1. acquire linux-3.10.41
> 2. apply patch-3.10.40-vs184.108.40.206.diff
> 3. apply the attached patch-3.10.40-41-vs220.127.116.11.diff
> i've successfully built the resulting kernel and tested it against testme.sh
> and testfs.sh in virtualbox.
The same happens with 3.2.60 and patch-3.2.59-vs18.104.22.168.diff
This http://sprunge.us/NeRA will fix the 2 rejects.