From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YL7Ig-0008Qa-OB for qemu-devel@nongnu.org; Tue, 10 Feb 2015 04:40:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YL7Id-000841-CD for qemu-devel@nongnu.org; Tue, 10 Feb 2015 04:40:10 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:39048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YL7Id-0007xw-3L for qemu-devel@nongnu.org; Tue, 10 Feb 2015 04:40:07 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Feb 2015 09:40:04 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 4EE6E219006C for ; Tue, 10 Feb 2015 09:39:58 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1A9e2ku1442112 for ; Tue, 10 Feb 2015 09:40:02 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1A9e2gk020904 for ; Tue, 10 Feb 2015 02:40:02 -0700 Message-ID: <54D9D1F1.7090004@de.ibm.com> Date: Tue, 10 Feb 2015 10:40:01 +0100 From: Christian Borntraeger MIME-Version: 1.0 References: <1423510988-48508-1-git-send-email-borntraeger@de.ibm.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Andy Whitcroft , qemu-devel , "Dr. David Alan Gilbert" Am 09.02.2015 um 23:54 schrieb Peter Maydell: > On 9 February 2015 at 19:43, Christian Borntraeger > wrote: >> From: Andy Whitcroft >> >> checkpatch currently loops on fpu/softfloat.c >> Turns out this is fixed in the Linux version of checkpatch. >> >> So this is a port of Andy Whitcrofts fix from Linux, >> Original commit was commit 89a883530fe7 ("checkpatch: ## is not a >> valid modifier") >> >> Cc: Andy Whitcroft >> Signed-off-by: Christian Borntraeger >> --- >> scripts/checkpatch.pl | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl >> index 5df61f9..8635f4c 100755 >> --- a/scripts/checkpatch.pl >> +++ b/scripts/checkpatch.pl >> @@ -1061,7 +1061,9 @@ sub possible { >> case| >> else| >> asm|__asm__| >> - do >> + do| >> + \#| >> + \#\#| > > Are you sure this line should end with a '|', given it's the > last item in the alternation ? Getting rid of that additional | also works, but both ways fix the endless loop. Certainly not having the "|" seems cleaner. (No idea why it works). Shall I respin without the "|"? I will then also send a patch for the kernel, in case we resync again in the future. Christian