[PATCH] reset: hi6220: Use the correct HiSilicon copyright

[PATCH] reset: hi6220: Use the correct HiSilicon copyright

[Hao Fang]

s/Hisilicon/HiSilicon/g.
It should use capital S, according to
https://www.hisilicon.com/en/terms-of-use.

Signed-off-by: Hao Fang <fanghao11@huawei.com>
---
 drivers/reset/hisilicon/hi6220_reset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
index 1992650..5ca145b 100644
--- a/drivers/reset/hisilicon/hi6220_reset.c
+++ b/drivers/reset/hisilicon/hi6220_reset.c
@@ -3,7 +3,7 @@
  * Hisilicon Hi6220 reset controller driver
  *
  * Copyright (c) 2016 Linaro Limited.
- * Copyright (c) 2015-2016 Hisilicon Limited.
+ * Copyright (c) 2015-2016 HiSilicon Limited.
  *
  * Author: Feng Chen <puck.chen@hisilicon.com>
  */
-- 
2.8.1

Re: [PATCH] reset: hi6220: Use the correct HiSilicon copyright

[Philipp Zabel]

On Tue, 2021-03-30 at 14:50 +0800, Hao Fang wrote:
> s/Hisilicon/HiSilicon/g.
> It should use capital S, according to
> https://www.hisilicon.com/en/terms-of-use.
> 
> Signed-off-by: Hao Fang <fanghao11@huawei.com>
> ---
>  drivers/reset/hisilicon/hi6220_reset.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
> index 1992650..5ca145b 100644
> --- a/drivers/reset/hisilicon/hi6220_reset.c
> +++ b/drivers/reset/hisilicon/hi6220_reset.c
> @@ -3,7 +3,7 @@
>   * Hisilicon Hi6220 reset controller driver

Why leave this "Hisilicon" alone?

>   *
>   * Copyright (c) 2016 Linaro Limited.
> - * Copyright (c) 2015-2016 Hisilicon Limited.
> + * Copyright (c) 2015-2016 HiSilicon Limited.
>   *
>   * Author: Feng Chen <puck.chen@hisilicon.com>
>   */

That will be a lot of churn:

  git grep Copyright.*Hisilicon | wc -l
  141

  git grep Hisilicon | wc -l
  371

Could I get an Acked-by from someone at HiSilicon for this?

regards
Philipp

Re: [PATCH] reset: hi6220: Use the correct HiSilicon copyright

[fanghao (A)]

On 2021/5/12 14:19, Philipp Zabel wrote:
> On Tue, 2021-03-30 at 14:50 +0800, Hao Fang wrote:
>> s/Hisilicon/HiSilicon/g.
>> It should use capital S, according to
>> https://www.hisilicon.com/en/terms-of-use.
>>
>> Signed-off-by: Hao Fang <fanghao11@huawei.com>
>> ---
>>  drivers/reset/hisilicon/hi6220_reset.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
>> index 1992650..5ca145b 100644
>> --- a/drivers/reset/hisilicon/hi6220_reset.c
>> +++ b/drivers/reset/hisilicon/hi6220_reset.c
>> @@ -3,7 +3,7 @@
>>   * Hisilicon Hi6220 reset controller driver
>
> Why leave this "Hisilicon" alone?

HiSilicon has applied for two trademarks Hisilicon/HiSilicon, so I think this one is OK. But there is only one English name for the company,
We have consulted with company's lawyer who suggested that should use a copyright statement consistent with the official website.

>
>>   *
>>   * Copyright (c) 2016 Linaro Limited.
>> - * Copyright (c) 2015-2016 Hisilicon Limited.
>> + * Copyright (c) 2015-2016 HiSilicon Limited.
>>   *
>>   * Author: Feng Chen <puck.chen@hisilicon.com>
>>   */
>
> That will be a lot of churn:
>
>   git grep Copyright.*Hisilicon | wc -l
>   141
>
>   git grep Hisilicon | wc -l
>   371

As mentioned above, I am focused on correcting the copyright.
5.13-rc1 has been released and I will continue to clean the rest by make one patch per subsystem.

Should I resend this based on 5.13-rc1?

>
> Could I get an Acked-by from someone at HiSilicon for this?

Maybe I could remind the author.

>
> regards
> Philipp
>
> .
>

Thank,
Hao

Re: [PATCH] reset: hi6220: Use the correct HiSilicon copyright

[Philipp Zabel]

Hi Hao,

On Thu, 2021-05-13 at 10:35 +0800, fanghao (A) wrote:
[...]
> diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
> > > index 1992650..5ca145b 100644
> > > --- a/drivers/reset/hisilicon/hi6220_reset.c
> > > +++ b/drivers/reset/hisilicon/hi6220_reset.c
> > > @@ -3,7 +3,7 @@
> > >   * Hisilicon Hi6220 reset controller driver
> > 
> > Why leave this "Hisilicon" alone?
> 
> HiSilicon has applied for two trademarks Hisilicon/HiSilicon, so I
> think this one is OK. But there is only one English name for the
> company,
> We have consulted with company's lawyer who suggested that should use
> a copyright statement consistent with the official website.

Ok, got it, thank you.

> > >   *
> > >   * Copyright (c) 2016 Linaro Limited.
> > > - * Copyright (c) 2015-2016 Hisilicon Limited.
> > > + * Copyright (c) 2015-2016 HiSilicon Limited.
> > >   *
> > >   * Author: Feng Chen <puck.chen@hisilicon.com>
> > >   */
> > 
> > That will be a lot of churn:
> > 
> >   git grep Copyright.*Hisilicon | wc -l
> >   141
> > 
> >   git grep Hisilicon | wc -l
> >   371
> 
> As mentioned above, I am focused on correcting the copyright.
> 5.13-rc1 has been released and I will continue to clean the rest by
> make one patch per subsystem.
> 
> Should I resend this based on 5.13-rc1?

Not necessary, the patch still applies.

> > Could I get an Acked-by from someone at HiSilicon for this?
> 
> Maybe I could remind the author.

That's ok, they are in Cc:.
I'll apply this to reset/next.

regards
Philipp