Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"

[Markus Armbruster]

Christian Borntraeger <address@hidden> writes:

> Am 09.02.2015 um 23:54 schrieb Peter Maydell:
>> On 9 February 2015 at 19:43, Christian Borntraeger
>> <address@hidden> wrote:
>>> From: Andy Whitcroft <address@hidden>
>>>
>>> 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 <address@hidden>
>>> Signed-off-by: Christian Borntraeger <address@hidden>
>>> ---
>>>  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.

If it works, I'd take it as is into QEMU, and get the cleanup from the
kernel in the next resync.