diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-05-20 19:23:33 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-05-20 19:23:33 +0000 |
| commit | 53098a8aa5685b515aaa1439ae54a367a3761e41 (patch) | |
| tree | 1d83488777877750e316c88f90d581f332e8d289 /scripts/combined-ext-image.sh | |
| parent | c4c4cce1901de9b44c23bc3f3d72cf5744ca2630 (diff) | |
| download | upstream-53098a8aa5685b515aaa1439ae54a367a3761e41.tar.gz upstream-53098a8aa5685b515aaa1439ae54a367a3761e41.tar.bz2 upstream-53098a8aa5685b515aaa1439ae54a367a3761e41.zip | |
generic/4.0: fix error during kernel patch application
Commit 5168c9a5702648eb690d32ec821647aca80aeba9 introduced a regression
during patch application on the 4.0 kernel. Some of the patched content
doesn't match the actual code, therefore leading to the following error:
Applying patch generic/667-ipv6-Fixed-source-specific-default-route-handling.patch
patching file net/ipv6/ip6_output.c
Hunk #1 FAILED at 886.
1 out of 1 hunk FAILED -- rejects in file net/ipv6/ip6_output.c
patching file net/ipv6/route.c
Hunk #1 succeeded at 2247 (offset 2 lines).
Patch generic/667-ipv6-Fixed-source-specific-default-route-handling.patch does not apply (enforce with -f)
This change just adapts the actual patch to fix what is in kernel 4.0
and make it apply cleanly.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
SVN-Revision: 45705
Diffstat (limited to 'scripts/combined-ext-image.sh')
0 files changed, 0 insertions, 0 deletions