[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

Kukjin Kim wrote:
> 
> From: Boojin Kim <boojin.kim@samsung.com>
> 
> Currently there were two part of DMAC PL330 driver for
> support old styled s3c-pl330 which has been merged into
> drivers/dma/pl330.c driver. Actually, there is no reason
> to separate them now.
> 
> Basically this patch merges arch/arm/common/pl330.c into
> drivers/dma/pl330.c driver and removes useless exported
> symbol, externed function and so on.
> 
> The newer pl330 driver tested on SMDKV310 and SMDK4212 boards
> 
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>

Hi Russell,

This addressed comments from you about moving 'asm/hardware/pl330.h' into
'drivers/dma/', there is nowhere it is used except drivers/dma/.

If you have any objection on this, please let me know.

As we talked last time, if you're ok on this let me send 'pull request' this
series to you and Vinod. I think this should be sent to rmk tree and dma
tree together.

As a note, this is in 'v3.4-for-vkoul-v2' of linux-samsung.git now.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Acked-by: Vinod Koul <vinod.koul@intel.com>
> Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> ---
> Changes since v2:
> - Address comments from Russell King
>   the 'asm/hardware/pl330.h' is moved to 'drivers/dma/pl330.h'
>   which is used only in drivers/dma/
> 
>  arch/arm/common/Kconfig               |    3 -
>  arch/arm/common/Makefile              |    1 -
>  arch/arm/common/pl330.c               | 1959
--------------------------------
> -
>  arch/arm/include/asm/hardware/pl330.h |  217 ----
>  drivers/dma/Kconfig                   |    1 -
>  drivers/dma/pl330.c                   | 1892
+++++++++++++++++++++++++++++++-
>  drivers/dma/pl330.h                   |  251 +++++
>  include/linux/amba/pl330.h            |    1 -
>  8 files changed, 2142 insertions(+), 2183 deletions(-)
>  delete mode 100644 arch/arm/common/pl330.c
>  delete mode 100644 arch/arm/include/asm/hardware/pl330.h
>  create mode 100644 drivers/dma/pl330.h

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Thu, Feb 16, 2012 at 2:57 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> From: Boojin Kim <boojin.kim@samsung.com>
>
> Currently there were two part of DMAC PL330 driver for
> support old styled s3c-pl330 which has been merged into
> drivers/dma/pl330.c driver. Actually, there is no reason
> to separate them now.
>
> Basically this patch merges arch/arm/common/pl330.c into
> drivers/dma/pl330.c driver and removes useless exported
> symbol, externed function and so on.
>
> The newer pl330 driver tested on SMDKV310 and SMDK4212 boards
>
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Acked-by: Vinod Koul <vinod.koul@intel.com>
> Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> ---
> Changes since v2:
> - Address comments from Russell King
> ?the 'asm/hardware/pl330.h' is moved to 'drivers/dma/pl330.h'
> ?which is used only in drivers/dma/
>
> ?arch/arm/common/Kconfig ? ? ? ? ? ? ? | ? ?3 -
> ?arch/arm/common/Makefile ? ? ? ? ? ? ?| ? ?1 -
> ?arch/arm/common/pl330.c ? ? ? ? ? ? ? | 1959 ---------------------------------
> ?arch/arm/include/asm/hardware/pl330.h | ?217 ----
> ?drivers/dma/Kconfig ? ? ? ? ? ? ? ? ? | ? ?1 -
> ?drivers/dma/pl330.c ? ? ? ? ? ? ? ? ? | 1892 +++++++++++++++++++++++++++++++-
> ?drivers/dma/pl330.h ? ? ? ? ? ? ? ? ? | ?251 +++++
> ?include/linux/amba/pl330.h ? ? ? ? ? ?| ? ?1 -
> ?8 files changed, 2142 insertions(+), 2183 deletions(-)
> ?delete mode 100644 arch/arm/common/pl330.c
> ?delete mode 100644 arch/arm/include/asm/hardware/pl330.h
> ?create mode 100644 drivers/dma/pl330.h
>
I repeat yet again, the drivers/dma/pl330.h is included _only_ by
drivers/dma/pl330.c so it'll be better to simply move its content
in the c file and reduce file count by 1.


> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index b8ec03e..65c5f24 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -1,4 +1,7 @@
> -/* linux/drivers/dma/pl330.c
> +/*
> + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> + * ? ? ? ? ? ? http://www.samsung.com
> + * Boojin Kim <boojin.kim@samsung.com>
> ?*
I object.
If simply moving the code around grants you share of authorship, then
every person who contributed even a single actual bug fix or feature qualifies
too.
Javi Merino from ARM Ltd contributed far more important patches to PL330
and he never claimed authorship (though I think, if not me, he would have
done the driver just as well or better).

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

Jassi Brar wrote:
> 
> On Thu, Feb 16, 2012 at 2:57 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > From: Boojin Kim <boojin.kim@samsung.com>
> >
> > Currently there were two part of DMAC PL330 driver for
> > support old styled s3c-pl330 which has been merged into
> > drivers/dma/pl330.c driver. Actually, there is no reason
> > to separate them now.
> >
> > Basically this patch merges arch/arm/common/pl330.c into
> > drivers/dma/pl330.c driver and removes useless exported
> > symbol, externed function and so on.
> >
> > The newer pl330 driver tested on SMDKV310 and SMDK4212 boards
> >
> > Cc: Jassi Brar <jassisinghbrar@gmail.com>
> > Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Acked-by: Vinod Koul <vinod.koul@intel.com>
> > Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> > ---
> > Changes since v2:
> > - Address comments from Russell King
> >  the 'asm/hardware/pl330.h' is moved to 'drivers/dma/pl330.h'
> >  which is used only in drivers/dma/
> >
> >  arch/arm/common/Kconfig               |    3 -
> >  arch/arm/common/Makefile              |    1 -
> >  arch/arm/common/pl330.c               | 1959 ----------------------------
> -----
> >  arch/arm/include/asm/hardware/pl330.h |  217 ----
> >  drivers/dma/Kconfig                   |    1 -
> >  drivers/dma/pl330.c                   | 1892
> +++++++++++++++++++++++++++++++-
> >  drivers/dma/pl330.h                   |  251 +++++
> >  include/linux/amba/pl330.h            |    1 -
> >  8 files changed, 2142 insertions(+), 2183 deletions(-)
> >  delete mode 100644 arch/arm/common/pl330.c
> >  delete mode 100644 arch/arm/include/asm/hardware/pl330.h
> >  create mode 100644 drivers/dma/pl330.h
> >
> I repeat yet again, the drivers/dma/pl330.h is included _only_ by
> drivers/dma/pl330.c so it'll be better to simply move its content
> in the c file and reduce file count by 1.
> 
Hmm, yeah, since the .h file contents is used only by .c file, it would be included in the .c file itself. But I'm not sure, in this case, which one is better.

> 
> > diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> > index b8ec03e..65c5f24 100644
> > --- a/drivers/dma/pl330.c
> > +++ b/drivers/dma/pl330.c
> > @@ -1,4 +1,7 @@
> > -/* linux/drivers/dma/pl330.c
> > +/*
> > + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> > + *             http://www.samsung.com
> > + * Boojin Kim <boojin.kim@samsung.com>
> >  *
> I object.
> If simply moving the code around grants you share of authorship, then
> every person who contributed even a single actual bug fix or feature
> qualifies
> too.
> Javi Merino from ARM Ltd contributed far more important patches to PL330
> and he never claimed authorship (though I think, if not me, he would have
> done the driver just as well or better).

I don't think so. Boojin Kim has done considerable changes to structure/frame of pl330.c. So adding copyright is fine to me. And since she has been doing these updates on behalf of Samsung, she has added attribution to Samsung also (which you never did while at Samsung). And, I don't think some patches are more important than the other. All patches, simple or complex, help in improving the code. In addition, she did not change the MODULE_AUTHOR.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Wed, Feb 22, 2012 at 5:52 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> And since she has been doing these updates on behalf of Samsung, she has
> added attribution to Samsung also (which you never did while at Samsung).
>
What the bloody fuck ?!!

Can't you read this ? .....

-------------------------
/* linux/drivers/dma/pl330.c
 *
 * Copyright (C) 2010 Samsung Electronics Co. Ltd.
 *      Jaswinder Singh <jassi.brar@samsung.com>
 *
-------------------------

I challenge you to show 1 file that I wrote while in Samsung which
doesn't show Samsung as the copyright holder.

>
> And, I don't think some patches are more important than the other.
> All patches, simple or complex, help in improving the code.
>
Bloody rant. Who said any type of patch is useless or doesn't improve code?!

I said, and still say, merging two files written by same person doesn't
grant you the right to add your own name as one of the authors.

And if you think Boojin's patches were any great (even after discounting
the number of iterations they took), Javi Merino's name should be added
before Boojin's.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

Jassi Brar wrote:
> 
> On Wed, Feb 22, 2012 at 5:52 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> >
> > And since she has been doing these updates on behalf of Samsung, she has
> > added attribution to Samsung also (which you never did while at Samsung).
> >
> What the bloody fuck ?!!
> 
Don't blame :( Why should I listen that from you.

> Can't you read this ? .....
> 
As I know, the Copyright can belong to a person or company. See my patches in mainline. I meant that. Of course, it depends on writer.

> -------------------------
> /* linux/drivers/dma/pl330.c
>  *
>  * Copyright (C) 2010 Samsung Electronics Co. Ltd.
>  *      Jaswinder Singh <jassi.brar@samsung.com>
>  *
> -------------------------
> 
> I challenge you to show 1 file that I wrote while in Samsung which
> doesn't show Samsung as the copyright holder.
> 

See above.

> >
> > And, I don't think some patches are more important than the other.
> > All patches, simple or complex, help in improving the code.
> >
> Bloody rant. Who said any type of patch is useless or doesn't improve
> code?!
> 
> I said, and still say, merging two files written by same person doesn't
> grant you the right to add your own name as one of the authors.
> 
> And if you think Boojin's patches were any great (even after discounting
> the number of iterations they took), Javi Merino's name should be added
> before Boojin's.

Unfortunately, I couldn't find his name for dma/pl330.c from my side and if required, he can do it later. Why should I do?

I'm very unhappy with this talking and I think, there is no more useful talking with you. I'd like to know opinions from Russell King(ARM maintainer) or Vinod Koul (DMA maintainer) for this.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Wed, Feb 22, 2012 at 7:41 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>
>> Can't you read this ? .....
>>
> As I know, the Copyright can belong to a person or company. See my patches in mainline. I meant that. Of course, it depends on writer.
>
>> -------------------------
>> /* linux/drivers/dma/pl330.c
>> ?*
>> ?* Copyright (C) 2010 Samsung Electronics Co. Ltd.
>> ?* ? ? ?Jaswinder Singh <jassi.brar@samsung.com>
>> ?*
>> -------------------------
>>
>> I challenge you to show 1 file that I wrote while in Samsung which
>> doesn't show Samsung as the copyright holder.
>>
>
> See above.
>
What crap, dude ?!

So you mean (a) is correct crediting while (b), which already exists,
doesn't give enough credit to Samsung ? Bloody double standards !

(a)
 + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
 + *             http://www.samsung.com
 + * Boojin Kim <boojin.kim@samsung.com>

(b)
 * Copyright (C) 2010 Samsung Electronics Co. Ltd.
 *      Jaswinder Singh <jassi.brar@samsung.com>

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Vinod Koul]

On Wed, 2012-02-22 at 08:01 +0530, Jassi Brar wrote:
> On Wed, Feb 22, 2012 at 7:41 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
Sadly, what a mess!!!

Jassi, you don't own the copyright, your company did, as they employed
you to do the job. So both your and Kukjin are not correct in claiming
the copyright!!

Jassi, your claim on being author is certainly right and you name should
be there as MODULE_AUTHOR.
Also, If you had a Authors line added and that was removed, then I would
have agreed with you.

And Kukjin, It wont hurt by giving credit to your former colleagues, by
doing something like:
http://permalink.gmane.org/gmane.linux.alsa.devel/94905


-- 
~Vinod

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Wed, Feb 22, 2012 at 3:57 PM, Vinod Koul <vinod.koul@intel.com> wrote:
>
> Sadly, what a mess!!!
>
> Jassi, you don't own the copyright, your company did, as they employed
> you to do the job. So both your and Kukjin are not correct in claiming
> the copyright!!
>
Read the thread again.
Nobody is claiming the copyright, it rests with Samsung as before.

Kukjin thinks merging two files is a serious enough change to
warrant co-authorship, which I disagree.
(The line below 'Copyright' tells the author, and its email, of the file).


> Jassi, your claim on being author is certainly right and you name should
> be there as MODULE_AUTHOR.
>
Please check, it is there indeed.


> Also, If you had a Authors line added and that was removed, then I would
> have agreed with you.
>
Equally objectionable is any tom, dick or harry claiming co-authorship
of a code(f3.c) that is almost an equivalent of  'cat f1.c f2.c > f3.c'

I am equally pissed off by the fact that Kukjin/Boojin sneaked in the
co-authorship in this revision while carrying over the Acked-by's from
previous revision as if it has already been approved by others.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Russell King - ARM Linux]

On Wed, Feb 22, 2012 at 04:42:08PM +0530, Jassi Brar wrote:
> On Wed, Feb 22, 2012 at 3:57 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> >
> > Sadly, what a mess!!!
> >
> > Jassi, you don't own the copyright, your company did, as they employed
> > you to do the job. So both your and Kukjin are not correct in claiming
> > the copyright!!
> >
> Read the thread again.
> Nobody is claiming the copyright, it rests with Samsung as before.
> 
> Kukjin thinks merging two files is a serious enough change to
> warrant co-authorship, which I disagree.

Get a clue.  Reading the patch.  Kukjin isn't claiming co-authorship.
Boojin is.  Different person.

> I am equally pissed off by the fact that Kukjin/Boojin sneaked in the
> co-authorship in this revision while carrying over the Acked-by's from
> previous revision as if it has already been approved by others.

Go and check the file history, and you'll see it's justified.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

On 02/22/12 19:27, Vinod Koul wrote:
> On Wed, 2012-02-22 at 08:01 +0530, Jassi Brar wrote:
>> On Wed, Feb 22, 2012 at 7:41 AM, Kukjin Kim<kgene.kim@samsung.com>  wrote:
> Sadly, what a mess!!!
>
[...]
>
> And Kukjin, It wont hurt by giving credit to your former colleagues, by
> doing something like:
> http://permalink.gmane.org/gmane.linux.alsa.devel/94905
>
Looks better and for this, let me use it like following as per your 
suggestion. And she agreed to use just company name Copyright.
...
*
* Copyright (c) 2012 Samsung Electronics Co., Ltd.
* 		http://www.samsung.com
*
* Copyright (C) 2010 Samsung Electronics Co. Ltd.
*	Jaswinder Singh <jassi.brar@samsung.com>
*
* Based on:
* 	arch/arm/common/pl330.c, arch/arm/include/asm/hardware/pl330.h
*	Copyright (C) 2010 Samsung Electronics Co Ltd.
*		Jaswinder Singh <jassi.brar@samsung.com>
*
...

And sorry for the annoying noise :(

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Wed, Feb 22, 2012 at 10:21 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> * ? ? ? ? ? ? ? http://www.samsung.com
> *
> * Copyright (C) 2010 Samsung Electronics Co. Ltd.
> * ? ? ? Jaswinder Singh <jassi.brar@samsung.com>
> *
The following is more appropriate

-  * Copyright (C) 2010 Samsung Electronics Co. Ltd.
+ * Copyright (C) 2010 - 2012 Samsung Electronics Co. Ltd.
   * ? ? ? Jaswinder Singh <jassi.brar@samsung.com>


> * Based on:
> * ? ? ? arch/arm/common/pl330.c, arch/arm/include/asm/hardware/pl330.h
> * ? ? ? Copyright (C) 2010 Samsung Electronics Co Ltd.
>
Doesn't make any sense because arch/arm/common/pl330.c
and arch/arm/include/asm/hardware/pl330.h wouldn't exist anymore,
and the changelog already provides that info.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

On 02/23/12 02:20, Jassi Brar wrote:
> On Wed, Feb 22, 2012 at 10:21 PM, Kukjin Kim<kgene.kim@samsung.com>  wrote:
>>
>> * Copyright (c) 2012 Samsung Electronics Co., Ltd.
>> *               http://www.samsung.com
>> *
>> * Copyright (C) 2010 Samsung Electronics Co. Ltd.
>> *       Jaswinder Singh<jassi.brar@samsung.com>
>> *
> The following is more appropriate
>
> -  * Copyright (C) 2010 Samsung Electronics Co. Ltd.
> + * Copyright (C) 2010 - 2012 Samsung Electronics Co. Ltd.
>     *       Jaswinder Singh<jassi.brar@samsung.com>
>
Well, as I know, I don't have to change/update original your copyright. 
If required, you should do it, next time.

>
>> * Based on:
>> *       arch/arm/common/pl330.c, arch/arm/include/asm/hardware/pl330.h
>> *       Copyright (C) 2010 Samsung Electronics Co Ltd.
>>
> Doesn't make any sense because arch/arm/common/pl330.c
> and arch/arm/include/asm/hardware/pl330.h wouldn't exist anymore,
> and the changelog already provides that info.

OK, will not add above 'based on'.

I think you can agree following. Let's finish this talking.

* Copyright (c) 2012 Samsung Electronics Co., Ltd.
*		http://www.samsung.com
*
and 'original copyright'...

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Wed, Feb 22, 2012 at 10:59 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>>>
>>> * Copyright (c) 2012 Samsung Electronics Co., Ltd.
>>> * ? ? ? ? ? ? ? http://www.samsung.com
>>> *
>>> * Copyright (C) 2010 Samsung Electronics Co. Ltd.
>>> * ? ? ? Jaswinder Singh<jassi.brar@samsung.com>
>>> *
>>
>> The following is more appropriate
>>
>> - ?* Copyright (C) 2010 Samsung Electronics Co. Ltd.
>> + * Copyright (C) 2010 - 2012 Samsung Electronics Co. Ltd.
>> ? ?* ? ? ? Jaswinder Singh<jassi.brar@samsung.com>
>>
> Well, as I know, I don't have to change/update original your copyright. If
> required, you should do it, next time.
>
FYI that that is not my copyright. That is Samsung's copyright.
     Jaswinder Singh<jassi.brar@samsung.com>   only claims to be the author.

And I don't expect you to correct my email id (we have to suffer an extra
mundane patch)

>
> I think you can agree following. Let's finish this talking.
>
>
> * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> * ? ? ? ? ? ? ? http://www.samsung.com
> *
> and 'original copyright'...
>
Doesn't make sense. Go look at other files in the kernel to find
how it's done (if you must update the year).

By your logic, next year someone would add
    + * Copyright (c) 2013 Samsung Electronics Co., Ltd.
    + *               http://www.samsung.com

and another year later
    + * Copyright (c) 2014 Samsung Electronics Co., Ltd.
    + *               http://www.samsung.com

and so on....

As I said, simply updating the current year in the same line works.
 -  * Copyright (C) 2010 Samsung Electronics Co. Ltd.
 + * Copyright (C) 2010 - 2012 Samsung Electronics Co. Ltd.
    *       Jaswinder Singh<jassi.brar@samsung.com>
And don't worry, you won't be doing me any favor by doing that.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Russell King - ARM Linux]

On Wed, Feb 22, 2012 at 10:50:29PM +0530, Jassi Brar wrote:
> > * Based on:
> > * ? ? ? arch/arm/common/pl330.c, arch/arm/include/asm/hardware/pl330.h
> > * ? ? ? Copyright (C) 2010 Samsung Electronics Co Ltd.
> >
> Doesn't make any sense because arch/arm/common/pl330.c
> and arch/arm/include/asm/hardware/pl330.h wouldn't exist anymore,

Rubbish.  It does make sense, because it's saying where the changes
came from.  That's done quite often when moving code around.

You could say that moving code from file A to file B and commenting
that it came from file A makes no sense because the code is no longer
in file A.  Well, that's definitely the case, but that doesn't mean
you don't credit where it came from in the first place.

I think you're making a mountain out of this mole hill.  There isn't
a problem here.  The above comments saying what happened are fine.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Jassi Brar]

On Thu, Feb 23, 2012 at 1:05 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:

Just in case you didn't read the ugly thread fully, let me clarify a few points.

> That, to me, means that Samsung hold the copyrights, and Jaswinder Singh
> was the author of it.  Jaswinder has no copyright on the code.
Exactly what I've been saying.


> Note that Boojin has contributed more lines of code than Javi.
>
More lines of code, yes. Note 0 contribution to the engine of pl330.
OTOH seeing the intricate fixes that Javi submitted to the core,
is impressive. Being the author of code, I sense Javi
has far better understanding of PL330 and the driver.


> What would be fair is to add the first _two_ lines indicating that
> Samsung maintains the copyright to 2012.
>
OK, but that may not be scalable considering next year too someone
could want to update the copyright to 2013 and so on.
So I suggested simply change 2010 to 2010-2012 in the existing notice.


> However, it would *not* be unreasonable to add Boojin Kim to
> drivers/dma/pl330.c as a separate patch _before_ or _after_ this patch,
> and I think that would be more warranted than adding Javi Merino as an
> author based on the above stats.
>
Based on the LOC stats, maybe. But not on the quality of patches.
I say let's add Javi and Boojin both.


>> Kukjin thinks merging two files is a serious enough change to
>> warrant co-authorship, which I disagree.
>
> Get a clue.  Reading the patch.  Kukjin isn't claiming co-authorship.
> Boojin is.  Different person.
>
I meant Kukjin is defending co-ownership of Boojin on the basis of this merge.


>> I am equally pissed off by the fact that Kukjin/Boojin sneaked in the
>> co-authorship in this revision while carrying over the Acked-by's from
>> previous revision as if it has already been approved by others.
>
>Go and check the file history, and you'll see it's justified.
>
Actually I know more than the history of file. I have worked with Boojin.

> Rubbish.  It does make sense, because it's saying where the changes
> came from.  That's done quite often when moving code around.
>
> You could say that moving code from file A to file B and commenting
> that it came from file A makes no sense because the code is no longer
> in file A.  Well, that's definitely the case, but that doesn't mean
> you don't credit where it came from in the first place.
>
Btw _every_ file involved in the merger is authored by me, so we are not
at the risk of wiping out credit log of someone's contribution.
Anyways, I think I can live with that piece of history stuck to the
file forever.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Kukjin Kim]

Jassi Brar wrote:
> 

Thank you for suggestions.

[...]

> 
> > What would be fair is to add the first _two_ lines indicating that
> > Samsung maintains the copyright to 2012.
> >
> OK, but that may not be scalable considering next year too someone
> could want to update the copyright to 2013 and so on.
> So I suggested simply change 2010 to 2010-2012 in the existing notice.
> 
It's time to finish this.

As I said, I will just add Samsung maintains the copyright to 2012 as per Russell King suggested.

Then, if the name of Boojin is required there, she will send it next time.

Again, I don't touch original copyright written by Jassi, because I don't have any right to do it with this patch.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3] DMA: PL330: Merge PL330 driver into drivers/dma/

[Russell King - ARM Linux]

On Wed, Feb 22, 2012 at 11:11:49AM +0900, Kukjin Kim wrote:
> Unfortunately, I couldn't find his name for dma/pl330.c from my side and
> if required, he can do it later. Why should I do?
> 
> I'm very unhappy with this talking and I think, there is no more useful
> talking with you. I'd like to know opinions from Russell King(ARM
> maintainer) or Vinod Koul (DMA maintainer) for this.

Let's take a step back, and see how things are in mainline at the
moment.

1. arch/arm/common/pl330.c and drivers/dma/pl330.c have this header:
 * Copyright (C) 2010 Samsung Electronics Co. Ltd.
 *      Jaswinder Singh <jassi.brar@samsung.com>

That, to me, means that Samsung hold the copyrights, and Jaswinder Singh
was the author of it.  Jaswinder has no copyright on the code.  That's
pretty standard if you're employed by a company (and some employment
contracts even assert that any idea you have, even outside work time,
becomes the property of the company you are working for... but that's
a different matter.)

2. The authorship on the lines in these files are:
$ git blame arch/arm/common/pl330.c | cut -b 11-26 |sort | uniq -c
   1892 Jassi Brar      
     66 Javi Merino     
      2 Lucas De Marchi 
$ git blame drivers/dma/pl330.c | cut -b 11-26 |sort | uniq -c
    185 Boojin Kim
      2 Dave Martin
    795 Jassi Brar
      8 Rob Herring
      1 Russell King
     53 Thomas Abraham
      2 Tushar Behera
      7 Vinod Koul

So, quite clearly, most of the driver code was written by Jassi, presumably
while under the employment of Samsung.  Note that Boojin has contributed
more lines of code than Javi.

3. The new header on the combined file has this:
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ * Boojin Kim <boojin.kim@samsung.com>
  *
  * Copyright (C) 2010 Samsung Electronics Co. Ltd.
  *     Jaswinder Singh <jassi.brar@samsung.com>

Given that this driver is merely taking arch/arm/common/pl330.c and
merging it into drivers/dma/pl330.c, it's not fair to add that if all
that's happened is code has been moved around, because it makes it look
like Boojin Kim is taking credit just for moving code.

What would be fair is to add the first _two_ lines indicating that
Samsung maintains the copyright to 2012.

However, it would *not* be unreasonable to add Boojin Kim to
drivers/dma/pl330.c as a separate patch _before_ or _after_ this patch,
and I think that would be more warranted than adding Javi Merino as an
author based on the above stats.

I think Boojin Kim is quite justified in having a mention at the top of
the file - but as a separate patch.  And Samsung are quite justified in
updating their copyright.

So, I think the problem is how this has been done.  Separate the two
changes and let's move on.