From owner-freebsd-stable@freebsd.org Fri Sep 30 19:07:39 2016 Return-Path: Delivered-To: freebsd-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4F35C04C2C for ; Fri, 30 Sep 2016 19:07:39 +0000 (UTC) (envelope-from torfinn.ingolfsen@getmail.no) Received: from lamora.getmail.no (lamora.getmail.no [84.210.184.7]) by mx1.freebsd.org (Postfix) with ESMTP id 464E812B for ; Fri, 30 Sep 2016 19:07:38 +0000 (UTC) (envelope-from torfinn.ingolfsen@getmail.no) Received: from localhost (localhost [127.0.0.1]) by lamora.getmail.no (Postfix) with ESMTP id 3510A108DBF for ; Fri, 30 Sep 2016 20:59:29 +0200 (CEST) Received: from lamora.getmail.no ([127.0.0.1]) by localhost (lamora.get.c.bitbit.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id V-1cTQH9v1dm for ; Fri, 30 Sep 2016 20:59:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by lamora.getmail.no (Postfix) with ESMTP id B7B76107A80 for ; Fri, 30 Sep 2016 20:59:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.8.4 lamora.getmail.no B7B76107A80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getmail.no; s=8A9C8B4C-D727-11E2-8095-B6466E6B3FA2; t=1475261968; bh=9oo+dzmUjSaSU9R0/MOJn7wjiZUAlHgoEfTxz74FRQw=; h=Date:From:To:Subject:Message-Id:Mime-Version:Content-Type: Content-Transfer-Encoding; b=CUoAR2H+YDFg8wKBJ/ftYFjeOsLdj2fkUy/uuOSKPzQP+za4LYS/xHeZhiEtUoky+ zl49ux5fSnAMiz1zsNqaCwd/WNymjbM9PWf2PCvB+pQLsBKa9LL1L9/cSSma7FfVEt Tx/0tNVlO37A35dqfxUSIP06eTXEu62n8Feq/N/Y= X-Virus-Scanned: amavisd-new at lamora.get.c.bitbit.net Received: from lamora.getmail.no ([127.0.0.1]) by localhost (lamora.get.c.bitbit.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 0sFlZRSGPs40 for ; Fri, 30 Sep 2016 20:59:28 +0200 (CEST) Received: from kg-core1.kg4.no (cm-84.209.39.108.getinternet.no [84.209.39.108]) by lamora.getmail.no (Postfix) with ESMTPSA id 90334108DBF for ; Fri, 30 Sep 2016 20:59:28 +0200 (CEST) Date: Fri, 30 Sep 2016 20:59:28 +0200 From: Torfinn Ingolfsen To: freebsd-stable@freebsd.org Subject: Re: aibs(4) / atk0110 support for newer systems Message-Id: <20160930205928.77d7e74f7bd1a35fcf1aa50a@getmail.no> In-Reply-To: <7d498084-ec05-d4c9-5f49-6aef32495caf@FreeBSD.org> References: <86cf8380-ac6f-55f0-f0f8-16000d7f04b2@FreeBSD.org> <20160930145704.4dbc9d90011154b38493964e@getmail.no> <7d498084-ec05-d4c9-5f49-6aef32495caf@FreeBSD.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.29; amd64-portbld-freebsd9.3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2016 19:07:39 -0000 On Fri, 30 Sep 2016 19:00:09 +0300 Andriy Gapon wrote: > On 30/09/2016 15:57, Torfinn Ingolfsen wrote: > > On Fri, 30 Sep 2016 14:30:02 +0300 > > Andriy Gapon 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@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@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@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@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