{"thread":{"id":"5716","subject":"apply-mbox claiming corrupt patch.","startedAt":"2006-09-27T02:46:29Z","lastAt":"2006-09-27T05:02:08Z","messageCount":4,"participants":["Dave Jones","Len Brown","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"27742","messageId":"20060927024628.GA29182@redhat.com","threadId":"5716","inReplyTo":null,"subject":"apply-mbox claiming corrupt patch.","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2006-09-27T02:46:29Z","receivedAt":"2006-09-27T02:46:29Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"I tried to apply the mail below to my cpufreq.git tree on master.kernel.org,\nand got ..\n\n$ git-applymbox -k mbox\n1 patch(es) to process.\n\nApplying '[CPUFREQ] Longhaul - Disable arbiter CLE266'\n\nfatal: corrupt patch at line 99\n\nI don't see what the problem is.  It applies fine with patch...\n\n(22:44:48:davej@hera:cpufreq)$ cat 1 | patch -p1 --dry-run\npatching file arch/i386/kernel/cpu/cpufreq/longhaul.c\n(22:44:53:davej@hera:cpufreq)$ \n\nI'm guessing it didn't like one of the headers, but chopping\nsome of them out hasn't seemed to improve things.\n\n\tDave\n\n\nFrom davej@redhat.com  Sun Sep 24 18:31:11 2006\nReturn-Path: <davej@redhat.com>\nReceived: from mx1.redhat.com (mx1.redhat.com [66.187.233.31])\n\tby hera.kernel.org (8.13.7/8.13.7) with ESMTP id k8OIUhQv017025\n\tfor <davej@kernel.org>; Sun, 24 Sep 2006 18:31:08 GMT\nReceived: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])\n\tby mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIUh5D022511\n\tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:43 -0400\nReceived: from pressure.kernelslacker.org (vpn-248-6.boston.redhat.com [10.13.248.6])\n\tby int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIUgGp026807\n\tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:42 -0400\nReceived: from pressure.kernelslacker.org (localhost.localdomain [127.0.0.1])\n\tby pressure.kernelslacker.org (8.13.8/8.13.8) with ESMTP id k8OIUfs6013171\n\tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:41 -0400\nReceived: (from davej@localhost)\n\tby pressure.kernelslacker.org (8.13.8/8.13.8/Submit) id k8OIUfjO013170\n\tfor davej@kernel.org; Sun, 24 Sep 2006 14:30:41 -0400\nResent-Message-Id: <200609241830.k8OIUfjO013170@pressure.kernelslacker.org>\nX-Authentication-Warning: pressure.kernelslacker.org: davej set sender to davej@redhat.com using -f\nX-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on hera.kernel.org\nX-Spam-Level: \nX-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,\n\tFORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.3\nReceived: from pobox.devel.redhat.com [10.11.255.8]\n\tby pressure.kernelslacker.org with IMAP (fetchmail-6.3.4)\n\tfor <davej@localhost> (single-drop); Sun, 24 Sep 2006 14:19:33 -0400 (EDT)\nReceived: from pobox.devel.redhat.com ([unix socket])\n\t by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;\n\t Sun, 24 Sep 2006 14:19:00 -0400\nX-Sieve: CMU Sieve 2.2\nReceived: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])\n\tby pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k8OIIxSA032250\n\tfor <davej@pobox.devel.redhat.com>; Sun, 24 Sep 2006 14:19:00 -0400\nReceived: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])\n\tby int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIIxG3022438\n\tfor <davej@redhat.com>; Sun, 24 Sep 2006 14:18:59 -0400\nReceived: from smtp4.poczta.interia.pl (smtp11.poczta.interia.pl [80.48.65.11])\n\tby mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k8OIIpQq020496\n\tfor <davej@redhat.com>; Sun, 24 Sep 2006 14:18:51 -0400\nReceived: by smtp4.poczta.interia.pl (INTERIA.PL, from userid 502)\n\tid 85328D228F; Sun, 24 Sep 2006 20:18:50 +0200 (CEST)\nReceived: from poczta.interia.pl (mi02.poczta.interia.pl [10.217.12.2])\n\tby smtp4.poczta.interia.pl (INTERIA.PL) with ESMTP id DFEF4D2265;\n\tSun, 24 Sep 2006 20:18:49 +0200 (CEST)\nReceived: by poczta.interia.pl (INTERIA.PL, from userid 502)\n\tid D1C072BD043; Sun, 24 Sep 2006 20:18:49 +0200 (CEST)\nReceived: from [172.16.5.114] (unknown [81.15.157.150])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby poczta.interia.pl (INTERIA.PL) with ESMTP id ECF6C2BD0BC;\n\tSun, 24 Sep 2006 20:18:45 +0200 (CEST)\nMessage-ID: <4516CE3D.5050101@interia.pl>\nDate: Sun, 24 Sep 2006 20:28:13 +0200\nFrom: =?ISO-8859-2?Q?Rafa=B3_Bilski?= <rafalbilski@interia.pl>\nUser-Agent: Thunderbird 1.5.0.5 (X11/20060805)\nMIME-Version: 1.0\nTo: Dave Jones <davej@redhat.com>\nCc: cpufreq@lists.linux.org.uk\nSubject: [CPUFREQ] Longhaul - Disable arbiter CLE266\nX-Enigmail-Version: 0.94.0.0\nContent-Type: text/plain; charset=ISO-8859-2\nContent-Transfer-Encoding: 8bit\nX-EMID: d25b6acc\nX-RedHat-Spam-Score: 0 \nResent-From: davej@redhat.com\nResent-Date: Sun, 24 Sep 2006 14:30:41 -0400\nResent-To: davej@kernel.org\nX-Virus-Scanned: ClamAV 0.88.4/1931/Sun Sep 24 07:51:08 2006 on hera.kernel.org\nX-Virus-Status: Clean\nStatus: RO\nContent-Length: 3399\nLines: 114\n\nPlease ignore previous message.\n\nThis patch is adding support for CPU connected to CLE266 \nchipset. For older CPU this is only way. For \"Powersaver\" \nprocessor this way will be used if ACPI C3 isn't supported.\n\nI have tested it. It seems to work exacly like ACPI. \nBut it is less safe. On CLE266 chipset port 0x22 is \nblocking processor access to PCI bus too.\n\nSigned-off-by: Rafa³ Bilski <rafalbilski@interia.pl>\nSigned-off-by: Dave Jones <davej@redhat.com>\n\n---\n\ndiff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c\n--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c\n+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c\n@@ -178,11 +178,17 @@ static void do_powersaver(int cx_address\n \tsafe_halt();\n \t/* Change frequency on next halt or sleep */\n \twrmsrl(MSR_VIA_LONGHAUL, longhaul.val);\n-\tACPI_FLUSH_CPU_CACHE();\n-\t/* Invoke C3 */\n-\tinb(cx_address);\n-\t/* Dummy op - must do something useless after P_LVL3 read */\n-\tt = inl(acpi_fadt.xpm_tmr_blk.address);\n+\tif (port22_en) {\n+\t\tACPI_FLUSH_CPU_CACHE();\n+\t\t/* Invoke C1 */\n+\t\thalt();\n+\t} else {\n+\t\tACPI_FLUSH_CPU_CACHE();\n+\t\t/* Invoke C3 */\n+\t\tinb(cx_address);\n+\t\t/* Dummy op - must do something useless after P_LVL3 read */\n+\t\tt = inl(acpi_fadt.xpm_tmr_blk.address);\n+\t}\n \n \t/* Disable bus ratio bit */\n \tlocal_irq_disable();\n@@ -567,16 +573,23 @@ static acpi_status longhaul_walk_callbac\n static int enable_arbiter_disable(void)\n {\n \tstruct pci_dev *dev;\n+\tint reg;\n \tu8 pci_cmd;\n \n \t/* Find PLE133 host bridge */\n+\treg = 0x78;\n \tdev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0, NULL);\n+\t/* Find CLE266 host bridge */\n+\tif (dev == NULL) {\n+\t\tdev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);\n+\t\treg = 0x76;\n+\t}\n \tif (dev != NULL) {\n \t\t/* Enable access to port 0x22 */\n-\t\tpci_read_config_byte(dev, 0x78, &pci_cmd);\n+\t\tpci_read_config_byte(dev, reg, &pci_cmd);\n \t\tif ( !(pci_cmd & 1<<7) ) {\n \t\t\tpci_cmd |= 1<<7;\n-\t\t\tpci_write_config_byte(dev, 0x78, pci_cmd);\n+\t\t\tpci_write_config_byte(dev, reg, pci_cmd);\n \t\t}\n \t\treturn 1;\n \t}\n@@ -681,19 +694,29 @@ static int __init longhaul_cpu_init(stru\n \t\t/* Check ACPI support for C3 state */\n \t\tcx = &pr->power.states[ACPI_STATE_C3];\n \t\tif (cx->address == 0 ||\n-\t\t   (cx->latency > 1000 && ignore_latency == 0) )\n-\t\t\tgoto err_acpi;\n+\t\t   (cx->latency > 1000 && ignore_latency == 0) ) {\n+\t\t\tif (enable_arbiter_disable()) {\n+\t\t\t\tport22_en = 1;\n+\t\t\t} else {\n+\t\t\t\tgoto err_acpi;\n+\t\t\t}\n+\t\t}\n \n \t} else {\n \t\t/* Check ACPI support for bus master arbiter disable */\n \t\tif (!pr->flags.bm_control) {\n-\t\t\tif (!enable_arbiter_disable()) {\n-\t\t\t\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 host bridge. Aborting.\\n\");\n-\t\t\t\treturn -ENODEV;\n-\t\t\t} else\n+\t\t\tif (enable_arbiter_disable()) {\n \t\t\t\tport22_en = 1;\n+\t\t\t} else {\n+\t\t\t\tgoto err_acpi;\n+\t\t\t}\n \t\t}\n \t}\n+\tif (!port22_en) {\n+\t\tprintk (KERN_INFO PFX \"Using ACPI support.\\n\");\n+\t} else {\n+\t\tprintk (KERN_INFO PFX \"Using northbridge support.\\n\");\n+\t}\n \n \tret = longhaul_get_ranges();\n \tif (ret != 0)\n@@ -716,7 +739,7 @@ static int __init longhaul_cpu_init(stru\n \treturn 0;\n \n err_acpi:\n-\tprintk(KERN_ERR PFX \"No ACPI support for CPU frequency changes.\\n\");\n+\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\\n\");\n \treturn -ENODEV;\n }\n\n\n----------------------------------------------------------------------\nJestes kierowca? To poczytaj! >>> http://link.interia.pl/f199e\n"},{"id":"27743","messageId":"200609262301.12235.len.brown@intel.com","threadId":"5716","inReplyTo":"20060927024628.GA29182@redhat.com","subject":"Re: apply-mbox claiming corrupt patch.","fromName":"Len Brown","fromEmail":"len.brown@intel.com","sentAt":"2006-09-27T03:01:12Z","receivedAt":"2006-09-27T03:01:12Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":"I ran into a similar problem recently -- though looking\nat the patch below I can't prove it is the exact same problem.\n\nPatch appears to put a space, + or - on each line.\nSomebody edited their patch with kate, and that automatically\n\"cleaned up\" the lines with just a space on them -- leaving\nthem completely blank.\n\npatch ate the result, but git-am (and git-apply) did not.\nfixed it by refreshing with quilt.\n\n-Len\n\nOn Tuesday 26 September 2006 22:46, Dave Jones wrote:\n> I tried to apply the mail below to my cpufreq.git tree on master.kernel.org,\n> and got ..\n> \n> $ git-applymbox -k mbox\n> 1 patch(es) to process.\n> \n> Applying '[CPUFREQ] Longhaul - Disable arbiter CLE266'\n> \n> fatal: corrupt patch at line 99\n> \n> I don't see what the problem is.  It applies fine with patch...\n> \n> (22:44:48:davej@hera:cpufreq)$ cat 1 | patch -p1 --dry-run\n> patching file arch/i386/kernel/cpu/cpufreq/longhaul.c\n> (22:44:53:davej@hera:cpufreq)$ \n> \n> I'm guessing it didn't like one of the headers, but chopping\n> some of them out hasn't seemed to improve things.\n> \n> \tDave\n> \n> \n> >From davej@redhat.com  Sun Sep 24 18:31:11 2006\n> Return-Path: <davej@redhat.com>\n> Received: from mx1.redhat.com (mx1.redhat.com [66.187.233.31])\n> \tby hera.kernel.org (8.13.7/8.13.7) with ESMTP id k8OIUhQv017025\n> \tfor <davej@kernel.org>; Sun, 24 Sep 2006 18:31:08 GMT\n> Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])\n> \tby mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIUh5D022511\n> \tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:43 -0400\n> Received: from pressure.kernelslacker.org (vpn-248-6.boston.redhat.com [10.13.248.6])\n> \tby int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIUgGp026807\n> \tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:42 -0400\n> Received: from pressure.kernelslacker.org (localhost.localdomain [127.0.0.1])\n> \tby pressure.kernelslacker.org (8.13.8/8.13.8) with ESMTP id k8OIUfs6013171\n> \tfor <davej@kernel.org>; Sun, 24 Sep 2006 14:30:41 -0400\n> Received: (from davej@localhost)\n> \tby pressure.kernelslacker.org (8.13.8/8.13.8/Submit) id k8OIUfjO013170\n> \tfor davej@kernel.org; Sun, 24 Sep 2006 14:30:41 -0400\n> Resent-Message-Id: <200609241830.k8OIUfjO013170@pressure.kernelslacker.org>\n> X-Authentication-Warning: pressure.kernelslacker.org: davej set sender to davej@redhat.com using -f\n> X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on hera.kernel.org\n> X-Spam-Level: \n> X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,\n> \tFORGED_RCVD_HELO,UNPARSEABLE_RELAY autolearn=ham version=3.1.3\n> Received: from pobox.devel.redhat.com [10.11.255.8]\n> \tby pressure.kernelslacker.org with IMAP (fetchmail-6.3.4)\n> \tfor <davej@localhost> (single-drop); Sun, 24 Sep 2006 14:19:33 -0400 (EDT)\n> Received: from pobox.devel.redhat.com ([unix socket])\n> \t by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;\n> \t Sun, 24 Sep 2006 14:19:00 -0400\n> X-Sieve: CMU Sieve 2.2\n> Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])\n> \tby pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k8OIIxSA032250\n> \tfor <davej@pobox.devel.redhat.com>; Sun, 24 Sep 2006 14:19:00 -0400\n> Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])\n> \tby int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8OIIxG3022438\n> \tfor <davej@redhat.com>; Sun, 24 Sep 2006 14:18:59 -0400\n> Received: from smtp4.poczta.interia.pl (smtp11.poczta.interia.pl [80.48.65.11])\n> \tby mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k8OIIpQq020496\n> \tfor <davej@redhat.com>; Sun, 24 Sep 2006 14:18:51 -0400\n> Received: by smtp4.poczta.interia.pl (INTERIA.PL, from userid 502)\n> \tid 85328D228F; Sun, 24 Sep 2006 20:18:50 +0200 (CEST)\n> Received: from poczta.interia.pl (mi02.poczta.interia.pl [10.217.12.2])\n> \tby smtp4.poczta.interia.pl (INTERIA.PL) with ESMTP id DFEF4D2265;\n> \tSun, 24 Sep 2006 20:18:49 +0200 (CEST)\n> Received: by poczta.interia.pl (INTERIA.PL, from userid 502)\n> \tid D1C072BD043; Sun, 24 Sep 2006 20:18:49 +0200 (CEST)\n> Received: from [172.16.5.114] (unknown [81.15.157.150])\n> \t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n> \t(No client certificate requested)\n> \tby poczta.interia.pl (INTERIA.PL) with ESMTP id ECF6C2BD0BC;\n> \tSun, 24 Sep 2006 20:18:45 +0200 (CEST)\n> Message-ID: <4516CE3D.5050101@interia.pl>\n> Date: Sun, 24 Sep 2006 20:28:13 +0200\n> From: =?ISO-8859-2?Q?Rafa=B3_Bilski?= <rafalbilski@interia.pl>\n> User-Agent: Thunderbird 1.5.0.5 (X11/20060805)\n> MIME-Version: 1.0\n> To: Dave Jones <davej@redhat.com>\n> Cc: cpufreq@lists.linux.org.uk\n> Subject: [CPUFREQ] Longhaul - Disable arbiter CLE266\n> X-Enigmail-Version: 0.94.0.0\n> Content-Type: text/plain; charset=ISO-8859-2\n> Content-Transfer-Encoding: 8bit\n> X-EMID: d25b6acc\n> X-RedHat-Spam-Score: 0 \n> Resent-From: davej@redhat.com\n> Resent-Date: Sun, 24 Sep 2006 14:30:41 -0400\n> Resent-To: davej@kernel.org\n> X-Virus-Scanned: ClamAV 0.88.4/1931/Sun Sep 24 07:51:08 2006 on hera.kernel.org\n> X-Virus-Status: Clean\n> Status: RO\n> Content-Length: 3399\n> Lines: 114\n> \n> Please ignore previous message.\n> \n> This patch is adding support for CPU connected to CLE266 \n> chipset. For older CPU this is only way. For \"Powersaver\" \n> processor this way will be used if ACPI C3 isn't supported.\n> \n> I have tested it. It seems to work exacly like ACPI. \n> But it is less safe. On CLE266 chipset port 0x22 is \n> blocking processor access to PCI bus too.\n> \n> Signed-off-by: Rafa³ Bilski <rafalbilski@interia.pl>\n> Signed-off-by: Dave Jones <davej@redhat.com>\n> \n> ---\n> \n> diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c\n> --- a/arch/i386/kernel/cpu/cpufreq/longhaul.c\n> +++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c\n> @@ -178,11 +178,17 @@ static void do_powersaver(int cx_address\n>  \tsafe_halt();\n>  \t/* Change frequency on next halt or sleep */\n>  \twrmsrl(MSR_VIA_LONGHAUL, longhaul.val);\n> -\tACPI_FLUSH_CPU_CACHE();\n> -\t/* Invoke C3 */\n> -\tinb(cx_address);\n> -\t/* Dummy op - must do something useless after P_LVL3 read */\n> -\tt = inl(acpi_fadt.xpm_tmr_blk.address);\n> +\tif (port22_en) {\n> +\t\tACPI_FLUSH_CPU_CACHE();\n> +\t\t/* Invoke C1 */\n> +\t\thalt();\n> +\t} else {\n> +\t\tACPI_FLUSH_CPU_CACHE();\n> +\t\t/* Invoke C3 */\n> +\t\tinb(cx_address);\n> +\t\t/* Dummy op - must do something useless after P_LVL3 read */\n> +\t\tt = inl(acpi_fadt.xpm_tmr_blk.address);\n> +\t}\n>  \n>  \t/* Disable bus ratio bit */\n>  \tlocal_irq_disable();\n> @@ -567,16 +573,23 @@ static acpi_status longhaul_walk_callbac\n>  static int enable_arbiter_disable(void)\n>  {\n>  \tstruct pci_dev *dev;\n> +\tint reg;\n>  \tu8 pci_cmd;\n>  \n>  \t/* Find PLE133 host bridge */\n> +\treg = 0x78;\n>  \tdev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0, NULL);\n> +\t/* Find CLE266 host bridge */\n> +\tif (dev == NULL) {\n> +\t\tdev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);\n> +\t\treg = 0x76;\n> +\t}\n>  \tif (dev != NULL) {\n>  \t\t/* Enable access to port 0x22 */\n> -\t\tpci_read_config_byte(dev, 0x78, &pci_cmd);\n> +\t\tpci_read_config_byte(dev, reg, &pci_cmd);\n>  \t\tif ( !(pci_cmd & 1<<7) ) {\n>  \t\t\tpci_cmd |= 1<<7;\n> -\t\t\tpci_write_config_byte(dev, 0x78, pci_cmd);\n> +\t\t\tpci_write_config_byte(dev, reg, pci_cmd);\n>  \t\t}\n>  \t\treturn 1;\n>  \t}\n> @@ -681,19 +694,29 @@ static int __init longhaul_cpu_init(stru\n>  \t\t/* Check ACPI support for C3 state */\n>  \t\tcx = &pr->power.states[ACPI_STATE_C3];\n>  \t\tif (cx->address == 0 ||\n> -\t\t   (cx->latency > 1000 && ignore_latency == 0) )\n> -\t\t\tgoto err_acpi;\n> +\t\t   (cx->latency > 1000 && ignore_latency == 0) ) {\n> +\t\t\tif (enable_arbiter_disable()) {\n> +\t\t\t\tport22_en = 1;\n> +\t\t\t} else {\n> +\t\t\t\tgoto err_acpi;\n> +\t\t\t}\n> +\t\t}\n>  \n>  \t} else {\n>  \t\t/* Check ACPI support for bus master arbiter disable */\n>  \t\tif (!pr->flags.bm_control) {\n> -\t\t\tif (!enable_arbiter_disable()) {\n> -\t\t\t\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 host bridge. Aborting.\\n\");\n> -\t\t\t\treturn -ENODEV;\n> -\t\t\t} else\n> +\t\t\tif (enable_arbiter_disable()) {\n>  \t\t\t\tport22_en = 1;\n> +\t\t\t} else {\n> +\t\t\t\tgoto err_acpi;\n> +\t\t\t}\n>  \t\t}\n>  \t}\n> +\tif (!port22_en) {\n> +\t\tprintk (KERN_INFO PFX \"Using ACPI support.\\n\");\n> +\t} else {\n> +\t\tprintk (KERN_INFO PFX \"Using northbridge support.\\n\");\n> +\t}\n>  \n>  \tret = longhaul_get_ranges();\n>  \tif (ret != 0)\n> @@ -716,7 +739,7 @@ static int __init longhaul_cpu_init(stru\n>  \treturn 0;\n>  \n>  err_acpi:\n> -\tprintk(KERN_ERR PFX \"No ACPI support for CPU frequency changes.\\n\");\n> +\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\\n\");\n>  \treturn -ENODEV;\n>  }\n> \n> \n> ----------------------------------------------------------------------\n> Jestes kierowca? To poczytaj! >>> http://link.interia.pl/f199e\n> \n> \n> -\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n"},{"id":"27747","messageId":"20060927031403.GA31144@redhat.com","threadId":"5716","inReplyTo":"200609262301.12235.len.brown@intel.com","subject":"Re: apply-mbox claiming corrupt patch.","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2006-09-27T03:14:03Z","receivedAt":"2006-09-27T03:14:03Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"On Tue, Sep 26, 2006 at 11:01:12PM -0400, Len Brown wrote:\n > I ran into a similar problem recently -- though looking\n > at the patch below I can't prove it is the exact same problem.\n > \n > Patch appears to put a space, + or - on each line.\n > Somebody edited their patch with kate, and that automatically\n > \"cleaned up\" the lines with just a space on them -- leaving\n > them completely blank.\n > \n > patch ate the result, but git-am (and git-apply) did not.\n > fixed it by refreshing with quilt.\n\nThrough some more trial and error, it turned out that chopping\noff the footer of the email (the last two lines here..)\n\n > > @@ -716,7 +739,7 @@ static int __init longhaul_cpu_init(stru\n > >  \treturn 0;\n > >  \n > >  err_acpi:\n > > -\tprintk(KERN_ERR PFX \"No ACPI support for CPU frequency changes.\\n\");\n > > +\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\\n\");\n > >  \treturn -ENODEV;\n > >  }\n > > \n > > \n > > ----------------------------------------------------------------------\n > > Jestes kierowca? To poczytaj! >>> http://link.interia.pl/f199e\n\nMade it all work.\nVery strange.\n\n\tDave\n"},{"id":"27755","messageId":"7vu02tj41b.fsf@assigned-by-dhcp.cox.net","threadId":"5716","inReplyTo":"20060927024628.GA29182@redhat.com","subject":"Re: apply-mbox claiming corrupt patch.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-09-27T05:02:08Z","receivedAt":"2006-09-27T05:02:08Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Dave Jones <davej@redhat.com> writes:\n\n> I tried to apply the mail below to my cpufreq.git tree on master.kernel.org,\n> and got ..\n>\n> $ git-applymbox -k mbox\n> 1 patch(es) to process.\n>\n> Applying '[CPUFREQ] Longhaul - Disable arbiter CLE266'\n>\n> fatal: corrupt patch at line 99\n\nLike 99 (counting from where mailinfo splits proposed commit log\nmessage and the patch body which is '---' line) is the line\nafter the closing brace \"}\" at the end of longhaul_cpu_init()\nfunction.\n\n> @@ -716,7 +739,7 @@ static int __init longhaul_cpu_init(stru\n>  \treturn 0;\n>  \n>  err_acpi:\n> -\tprintk(KERN_ERR PFX \"No ACPI support for CPU frequency changes.\\n\");\n> +\tprintk(KERN_ERR PFX \"No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\\n\");\n>  \treturn -ENODEV;\n>  }\n>\n>\n> ----------------------------------------------------------------------\n> Jestes kierowca? To poczytaj! >>> http://link.interia.pl/f199e\n\nThe hunk claims to have 7 preimage lines and 7 postimage lines,\nso that empty line after the closing brace _is_ part of the\nhunk.  And an empty context line is SP followed by LF.  But the\nSP that should be at the beginning of that line does not exist.\n\nIn short, you have a corrupt patch.\n"}]}