From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn0io-00047V-Rn for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:50:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zn0in-00076x-N6 for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:50:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn0in-00076s-91 for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:50:41 -0400 From: Paolo Bonzini Date: Fri, 16 Oct 2015 10:49:37 +0200 Message-Id: <1444985411-17803-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1444985411-17803-1-git-send-email-pbonzini@redhat.com> References: <1444985411-17803-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 15/49] checkpatch: port fix from kernel "## is not a valid modifier" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andy Whitcroft , Christian Borntraeger 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") As suggested by Peter Maydell for the QEMU version we drop the last "|" as there seems to be no need for that. (FWIW, the kernel discusion about that dried out: http://www.spinics.net/lists/kernel/msg1944421.html ) Cc: Andy Whitcroft Signed-off-by: Christian Borntraeger Message-Id: <1444291524-66569-1-git-send-email-borntraeger@de.ibm.com> Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d51346a..b0f6e11 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1010,7 +1010,9 @@ sub possible { case| else| asm|__asm__| - do + do| + \#| + \#\# )(?:\s|$)| ^(?:typedef|struct|enum)\b )}x; -- 2.5.0