From: Harald Mommer <[email protected]>
Signed-off-by: Harald Mommer <[email protected]>
---
MAINTAINERS | 7 +++++++
drivers/net/can/virtio_can.c | 6 ++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 379945f82a64..01b2738b7c16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21692,6 +21692,13 @@ F: drivers/vhost/scsi.c
F: include/uapi/linux/virtio_blk.h
F: include/uapi/linux/virtio_scsi.h
+VIRTIO CAN DRIVER
+M: "Harald Mommer" <[email protected]>
+L: [email protected]
+S: Maintained
+F: drivers/net/can/virtio_can.c
+F: include/uapi/linux/virtio_can.h
+
VIRTIO CONSOLE DRIVER
M: Amit Shah <[email protected]>
L: [email protected]
diff --git a/drivers/net/can/virtio_can.c b/drivers/net/can/virtio_can.c
index 43cf1c9e4afd..0e87172bbddf 100644
--- a/drivers/net/can/virtio_can.c
+++ b/drivers/net/can/virtio_can.c
@@ -1,7 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-only
/*
* CAN bus driver for the Virtio CAN controller
- * Copyright (C) 2021 OpenSynergy GmbH
+ * Copyright (C) 2021-2022 OpenSynergy GmbH
*/
#include <linux/atomic.h>
@@ -793,8 +793,6 @@ static void virtio_can_populate_vqs(struct virtio_device *vdev)
unsigned int idx;
int ret;
- // TODO: Think again a moment if here locks already may be needed!
-
/* Fill RX queue */
vq = priv->vqs[VIRTIO_CAN_QUEUE_RX];
for (idx = 0u; idx < ARRAY_SIZE(priv->rpkt); idx++) {
--
2.17.1
On Sat. 5 Nov. 2022 at 02:29, Harald Mommer
<[email protected]> wrote:
> From: Harald Mommer <[email protected]>
>
> Signed-off-by: Harald Mommer <[email protected]>
> ---
> MAINTAINERS | 7 +++++++
> drivers/net/can/virtio_can.c | 6 ++----
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 379945f82a64..01b2738b7c16 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -21692,6 +21692,13 @@ F: drivers/vhost/scsi.c
> F: include/uapi/linux/virtio_blk.h
> F: include/uapi/linux/virtio_scsi.h
>
> +VIRTIO CAN DRIVER
> +M: "Harald Mommer" <[email protected]>
> +L: [email protected]
> +S: Maintained
> +F: drivers/net/can/virtio_can.c
> +F: include/uapi/linux/virtio_can.h
> +
> VIRTIO CONSOLE DRIVER
> M: Amit Shah <[email protected]>
> L: [email protected]
> diff --git a/drivers/net/can/virtio_can.c b/drivers/net/can/virtio_can.c
> index 43cf1c9e4afd..0e87172bbddf 100644
> --- a/drivers/net/can/virtio_can.c
> +++ b/drivers/net/can/virtio_can.c
> @@ -1,7 +1,7 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +// SPDX-License-Identifier: GPL-2.0-only
Please squash this in the previous patch.
> /*
> * CAN bus driver for the Virtio CAN controller
> - * Copyright (C) 2021 OpenSynergy GmbH
> + * Copyright (C) 2021-2022 OpenSynergy GmbH
Same.
> */
>
> #include <linux/atomic.h>
> @@ -793,8 +793,6 @@ static void virtio_can_populate_vqs(struct virtio_device *vdev)
> unsigned int idx;
> int ret;
>
> - // TODO: Think again a moment if here locks already may be needed!
Same.
> /* Fill RX queue */
> vq = priv->vqs[VIRTIO_CAN_QUEUE_RX];
> for (idx = 0u; idx < ARRAY_SIZE(priv->rpkt); idx++) {
> --
> 2.17.1
>
Hello Vincent,
what I see here are places from v1 which should be now obsolete and of
no further interest. There was a patch v1, this has been reworked and
now comes v2 which supersedes v1. Squashing is something I could do if I
had 2 commits which should be joined together but here is probably not
meant to squash the virtio_can.[ch] code file commit with the
MAINTAINERS file commit.
Could be that I misunderstood the way how is worked with patches on the
mailing lists, don't know. I do absolutely not understand what you mean
here.
Regards
Harald
On 05.11.22 11:14, Vincent Mailhol wrote:
> On Sat. 5 Nov. 2022 at 02:29, Harald Mommer
> <[email protected]> wrote:
>> From: Harald Mommer <[email protected]>
>>
>> Signed-off-by: Harald Mommer <[email protected]>
>> ---
>> MAINTAINERS | 7 +++++++
>> drivers/net/can/virtio_can.c | 6 ++----
>> 2 files changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 379945f82a64..01b2738b7c16 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -21692,6 +21692,13 @@ F: drivers/vhost/scsi.c
>> F: include/uapi/linux/virtio_blk.h
>> F: include/uapi/linux/virtio_scsi.h
>>
>> +VIRTIO CAN DRIVER
>> +M: "Harald Mommer" <[email protected]>
>> +L: [email protected]
>> +S: Maintained
>> +F: drivers/net/can/virtio_can.c
>> +F: include/uapi/linux/virtio_can.h
>> +
>> VIRTIO CONSOLE DRIVER
>> M: Amit Shah <[email protected]>
>> L: [email protected]
>> diff --git a/drivers/net/can/virtio_can.c b/drivers/net/can/virtio_can.c
>> index 43cf1c9e4afd..0e87172bbddf 100644
>> --- a/drivers/net/can/virtio_can.c
>> +++ b/drivers/net/can/virtio_can.c
>> @@ -1,7 +1,7 @@
>> -// SPDX-License-Identifier: GPL-2.0+
>> +// SPDX-License-Identifier: GPL-2.0-only
> Please squash this in the previous patch.
>
>> /*
>> * CAN bus driver for the Virtio CAN controller
>> - * Copyright (C) 2021 OpenSynergy GmbH
>> + * Copyright (C) 2021-2022 OpenSynergy GmbH
> Same.
>
>> */
>>
>> #include <linux/atomic.h>
>> @@ -793,8 +793,6 @@ static void virtio_can_populate_vqs(struct virtio_device *vdev)
>> unsigned int idx;
>> int ret;
>>
>> - // TODO: Think again a moment if here locks already may be needed!
> Same.
>
>> /* Fill RX queue */
>> vq = priv->vqs[VIRTIO_CAN_QUEUE_RX];
>> for (idx = 0u; idx < ARRAY_SIZE(priv->rpkt); idx++) {
>> --
>> 2.17.1
>>
Hello Vincent,
sorry, my mistake, got it. I was absolutely convinced that commit 1 only
contained the code changes and commit 2 only contained the maintainers
file. But this is not the case, there was a last minute change and then
I did it wrong in git.
Regards
Harald
On 08.11.22 20:13, Harald Mommer wrote:
> Hello Vincent,
>
> what I see here are places from v1 which should be now obsolete and of
> no further interest. There was a patch v1, this has been reworked and
> now comes v2 which supersedes v1. Squashing is something I could do if
> I had 2 commits which should be joined together but here is probably
> not meant to squash the virtio_can.[ch] code file commit with the
> MAINTAINERS file commit.
>
> Could be that I misunderstood the way how is worked with patches on
> the mailing lists, don't know. I do absolutely not understand what you
> mean here.
>
> Regards
> Harald
>
> On 05.11.22 11:14, Vincent Mailhol wrote:
>> On Sat. 5 Nov. 2022 at 02:29, Harald Mommer
>> <[email protected]> wrote:
>>> From: Harald Mommer <[email protected]>
>>>
>>> Signed-off-by: Harald Mommer <[email protected]>
>>> ---
>>> MAINTAINERS | 7 +++++++
>>> drivers/net/can/virtio_can.c | 6 ++----
>>> 2 files changed, 9 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 379945f82a64..01b2738b7c16 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -21692,6 +21692,13 @@ F: drivers/vhost/scsi.c
>>> F: include/uapi/linux/virtio_blk.h
>>> F: include/uapi/linux/virtio_scsi.h
>>>
>>> +VIRTIO CAN DRIVER
>>> +M: "Harald Mommer" <[email protected]>
>>> +L: [email protected]
>>> +S: Maintained
>>> +F: drivers/net/can/virtio_can.c
>>> +F: include/uapi/linux/virtio_can.h
>>> +
>>> VIRTIO CONSOLE DRIVER
>>> M: Amit Shah <[email protected]>
>>> L: [email protected]
>>> diff --git a/drivers/net/can/virtio_can.c
>>> b/drivers/net/can/virtio_can.c
>>> index 43cf1c9e4afd..0e87172bbddf 100644
>>> --- a/drivers/net/can/virtio_can.c
>>> +++ b/drivers/net/can/virtio_can.c
>>> @@ -1,7 +1,7 @@
>>> -// SPDX-License-Identifier: GPL-2.0+
>>> +// SPDX-License-Identifier: GPL-2.0-only
>> Please squash this in the previous patch.
>>
>>> /*
>>> * CAN bus driver for the Virtio CAN controller
>>> - * Copyright (C) 2021 OpenSynergy GmbH
>>> + * Copyright (C) 2021-2022 OpenSynergy GmbH
>> Same.
>>
>>> */
>>>
>>> #include <linux/atomic.h>
>>> @@ -793,8 +793,6 @@ static void virtio_can_populate_vqs(struct
>>> virtio_device *vdev)
>>> unsigned int idx;
>>> int ret;
>>>
>>> - // TODO: Think again a moment if here locks already may be
>>> needed!
>> Same.
>>
>>> /* Fill RX queue */
>>> vq = priv->vqs[VIRTIO_CAN_QUEUE_RX];
>>> for (idx = 0u; idx < ARRAY_SIZE(priv->rpkt); idx++) {
>>> --
>>> 2.17.1
>>>
--
Dipl.-Ing. Harald Mommer
Senior Software Engineer
OpenSynergy GmbH
Rotherstr. 20, 10245 Berlin
Phone: +49 (30) 60 98 540-0 <== Zentrale
Fax: +49 (30) 60 98 540-99
E-Mail: [email protected]
http://www.opensynergy.com
Handelsregister: Amtsgericht Charlottenburg, HRB 108616B
Geschäftsführer/Managing Director: Regis Adjamah