On Sat, 1 Oct 2016 00:08:15 +0300
Andriy Gapon <avg at FreeBSD.org> wrote:
> On 30/09/2016 21:59, Torfinn Ingolfsen wrote:
> > As I used '-C' as an argument to patch, there isn't one:
> > root at kg-core1# l /sys/dev/acpi_support/atk0110.c.rej
> > ls: /sys/dev/acpi_support/atk0110.c.rej: No such file or directory
>
> Right. So, I guess I have to specifically ask to not use -C option? :-)
Sorry for the delay. I was distracted by other things.
root at kg-core1# cd /
root at kg-core1# patch -p1 < /home/tingo/dl/aibs-ggrp-gitm.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/dev/acpi_support/atk0110.c b/sys/dev/acpi_support/atk0110.c
|index e79a0e00e3577..743684100f737 100644
|--- a/sys/dev/acpi_support/atk0110.c
|+++ b/sys/dev/acpi_support/atk0110.c
--------------------------
Patching file sys/dev/acpi_support/atk0110.c using Plan A...
Hunk #1 succeeded at 28.
Hunk #2 succeeded at 52.
Hunk #3 succeeded at 78.
Hunk #4 succeeded at 124.
Hunk #5 succeeded at 362.
Hunk #6 succeeded at 370.
Hunk #7 failed at 391.
Hunk #8 succeeded at 435.
Hunk #9 succeeded at 450.
Hunk #10 failed at 488.
2 out of 10 hunks failed--saving rejects to sys/dev/acpi_support/atk0110.c.rej
HTH
--
Torfinn Ingolfsen <torfinn.ingolfsen at getmail.no>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: atk0110.c.rej
Type: application/octet-stream
Size: 5628 bytes
Desc: not available
URL:
<http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20161003/5b23a5a6/attachment.obj>