On Fri, 30 Sep 2016 19:00:09 +0300 Andriy Gapon <avg at FreeBSD.org> wrote:> On 30/09/2016 15:57, Torfinn Ingolfsen wrote: > > On Fri, 30 Sep 2016 14:30:02 +0300 > > Andriy Gapon <avg at FreeBSD.org> wrote: > > > >> Testing the patch should be as easy as building, installing and loading aibs > >> module (found in sys/modules/acpi/aibs). Well, also don't forget to apply the > >> patch with patch -p1 :-) > > > > The patch doesn't apply cleanly on FreeBSD 9.3-stable: > > root at kg-core1# patch -C -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 > > done > > > > I'm running > > root at kg-core1# uname -a > > FreeBSD kg-core1.kg4.no 9.3-STABLE FreeBSD 9.3-STABLE #3 r304838: Fri Aug 26 12:11:25 CEST 2016 root at kg-core1.kg4.no:/usr/obj/usr/src/sys/GENERIC amd64 > > Please show the .rej file.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 -- Torfinn Ingolfsen <torfinn.ingolfsen at getmail.no>
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 directoryRight. So, I guess I have to specifically ask to not use -C option? :-) -- Andriy Gapon
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>