From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36228)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZkSFj-00078p-Ca
	for qemu-devel@nongnu.org; Fri, 09 Oct 2015 03:38:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZkSFf-0007I8-5Y
	for qemu-devel@nongnu.org; Fri, 09 Oct 2015 03:38:07 -0400
Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:35356)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZkSFe-0007Hy-WC
	for qemu-devel@nongnu.org; Fri, 09 Oct 2015 03:38:03 -0400
Received: by wicge5 with SMTP id ge5so56106841wic.0
	for <qemu-devel@nongnu.org>; Fri, 09 Oct 2015 00:38:02 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1444291524-66569-1-git-send-email-borntraeger@de.ibm.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <56176ED6.5070909@redhat.com>
Date: Fri, 9 Oct 2015 09:37:58 +0200
MIME-Version: 1.0
In-Reply-To: <1444291524-66569-1-git-send-email-borntraeger@de.ibm.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH/] checkpatch: port fix from kernel "## is
 not a valid modifier"
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Christian Borntraeger <borntraeger@de.ibm.com>, qemu-devel <qemu-devel@nongnu.org>
Cc: Andy Whitcroft <apw@canonical.com>, Peter Maydell <peter.maydell@linaro.org>

On 08/10/2015 10:05, Christian Borntraeger wrote:
> From: Andy Whitcroft <apw@canonical.com>
> 
> 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 <apw@canonical.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

Queued, thanks.

Paolo

> ---
>  scripts/checkpatch.pl | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index b6d71ea..9755e82 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;
>