* [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
@ 2015-02-09 19:43 Christian Borntraeger
2015-02-09 22:54 ` Peter Maydell
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2015-02-09 19:43 UTC (permalink / raw)
To: Peter Maydell; +Cc: Andy Whitcroft, Christian Borntraeger, qemu-devel, dgilbert
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")
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
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|
+ \#|
+ \#\#|
)(?:\s|$)|
^(?:typedef|struct|enum)\b
)}x;
--
1.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 19:43 [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier" Christian Borntraeger
@ 2015-02-09 22:54 ` Peter Maydell
2015-02-10 8:07 ` Christian Borntraeger
2015-02-10 9:40 ` Christian Borntraeger
0 siblings, 2 replies; 9+ messages in thread
From: Peter Maydell @ 2015-02-09 22:54 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Andy Whitcroft, qemu-devel, Dr. David Alan Gilbert
On 9 February 2015 at 19:43, Christian Borntraeger
<borntraeger@de.ibm.com> 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")
>
> Cc: Andy Whitcroft <apw@canonical.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> 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 ?
> )(?:\s|$)|
> ^(?:typedef|struct|enum)\b
> )}x;
> --
> 1.9.3
>
thanks
-- PMM
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 22:54 ` Peter Maydell
@ 2015-02-10 8:07 ` Christian Borntraeger
2015-02-10 9:40 ` Christian Borntraeger
1 sibling, 0 replies; 9+ messages in thread
From: Christian Borntraeger @ 2015-02-10 8:07 UTC (permalink / raw)
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
> <borntraeger@de.ibm.com> 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")
>>
>> Cc: Andy Whitcroft <apw@canonical.com>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> 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 ?
Good question - dont know. But the kernel version looks the same.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 22:54 ` Peter Maydell
2015-02-10 8:07 ` Christian Borntraeger
@ 2015-02-10 9:40 ` Christian Borntraeger
2015-02-10 12:01 ` Markus Armbruster
1 sibling, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2015-02-10 9:40 UTC (permalink / raw)
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
> <borntraeger@de.ibm.com> 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")
>>
>> Cc: Andy Whitcroft <apw@canonical.com>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-10 9:40 ` Christian Borntraeger
@ 2015-02-10 12:01 ` Markus Armbruster
0 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2015-02-10 12:01 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Andy Whitcroft, Peter Maydell, qemu-devel, Dr. David Alan Gilbert
Christian Borntraeger <borntraeger@de.ibm.com> writes:
> Am 09.02.2015 um 23:54 schrieb Peter Maydell:
>> On 9 February 2015 at 19:43, Christian Borntraeger
>> <borntraeger@de.ibm.com> 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")
>>>
>>> Cc: Andy Whitcroft <apw@canonical.com>
>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>> ---
>>> 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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 15:08 ` Christian Borntraeger
@ 2015-02-09 15:59 ` Don Slutz
0 siblings, 0 replies; 9+ messages in thread
From: Don Slutz @ 2015-02-09 15:59 UTC (permalink / raw)
To: Christian Borntraeger, Paolo Bonzini, Peter Maydell
Cc: Andy Whitcroft, qemu-devel, dgilbert
On 02/09/15 10:08, Christian Borntraeger wrote:
> Am 09.02.2015 um 15:31 schrieb Paolo Bonzini:
>>
>>
>> On 09/02/2015 13:18, 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")
>>
>> I think you need to send it as a toplevel patch for Peter to pick it up.
>
> What do you mean? This patch is on top of qemu/master - if I dont messed up.
>
The patch email headers:
...
Message-ID: <1423484293-46903-1-git-send-email-borntraeger@de.ibm.com>
X-Mailer: git-send-email 1.9.3
In-Reply-To:
<CAFEAcA9dvehzeL1T+BT3N+_GJtGoL4ig_opv7rVT-0eJekLAvg@mail.gmail.com>
References:
<CAFEAcA9dvehzeL1T+BT3N+_GJtGoL4ig_opv7rVT-0eJekLAvg@mail.gmail.com>
...
Say that it is a reply, not a new email thread.
-Don Slutz
> Christian
>>
>> Paolo
>>
>>> Cc: Andy Whitcroft <apw@canonical.com>
>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>> ---
>>> 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|
>>> + \#|
>>> + \#\#|
>>> )(?:\s|$)|
>>> ^(?:typedef|struct|enum)\b
>>> )}x;
>>>
>>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 14:31 ` Paolo Bonzini
@ 2015-02-09 15:08 ` Christian Borntraeger
2015-02-09 15:59 ` Don Slutz
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2015-02-09 15:08 UTC (permalink / raw)
To: Paolo Bonzini, Peter Maydell; +Cc: Andy Whitcroft, qemu-devel, dgilbert
Am 09.02.2015 um 15:31 schrieb Paolo Bonzini:
>
>
> On 09/02/2015 13:18, 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")
>
> I think you need to send it as a toplevel patch for Peter to pick it up.
What do you mean? This patch is on top of qemu/master - if I dont messed up.
Christian
>
> Paolo
>
>> Cc: Andy Whitcroft <apw@canonical.com>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> 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|
>> + \#|
>> + \#\#|
>> )(?:\s|$)|
>> ^(?:typedef|struct|enum)\b
>> )}x;
>>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-09 12:18 ` [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier" Christian Borntraeger
@ 2015-02-09 14:31 ` Paolo Bonzini
2015-02-09 15:08 ` Christian Borntraeger
0 siblings, 1 reply; 9+ messages in thread
From: Paolo Bonzini @ 2015-02-09 14:31 UTC (permalink / raw)
To: Christian Borntraeger, Peter Maydell; +Cc: Andy Whitcroft, qemu-devel, dgilbert
On 09/02/2015 13:18, 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")
I think you need to send it as a toplevel patch for Peter to pick it up.
Paolo
> Cc: Andy Whitcroft <apw@canonical.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> 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|
> + \#|
> + \#\#|
> )(?:\s|$)|
> ^(?:typedef|struct|enum)\b
> )}x;
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier"
2015-02-02 20:22 [Qemu-devel] This patch hunk will hang scripts/checkpatch.pl Peter Maydell
@ 2015-02-09 12:18 ` Christian Borntraeger
2015-02-09 14:31 ` Paolo Bonzini
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2015-02-09 12:18 UTC (permalink / raw)
To: Peter Maydell; +Cc: Andy Whitcroft, Christian Borntraeger, qemu-devel, dgilbert
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")
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
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|
+ \#|
+ \#\#|
)(?:\s|$)|
^(?:typedef|struct|enum)\b
)}x;
--
1.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-02-10 12:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-09 19:43 [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier" Christian Borntraeger
2015-02-09 22:54 ` Peter Maydell
2015-02-10 8:07 ` Christian Borntraeger
2015-02-10 9:40 ` Christian Borntraeger
2015-02-10 12:01 ` Markus Armbruster
-- strict thread matches above, loose matches on Subject: below --
2015-02-02 20:22 [Qemu-devel] This patch hunk will hang scripts/checkpatch.pl Peter Maydell
2015-02-09 12:18 ` [Qemu-devel] [PATCH] checkpatch: port fix from kernel "## is not a valid modifier" Christian Borntraeger
2015-02-09 14:31 ` Paolo Bonzini
2015-02-09 15:08 ` Christian Borntraeger
2015-02-09 15:59 ` Don Slutz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.