Patchwork net: pxa168_etc.c recognize additional contributors

login
register
mail settings
Submitter Philip Rakity
Date Sept. 28, 2010, 2:26 p.m.
Message ID <73276AFF-CD7C-4D61-AD6B-E0EC48C5D30C@marvell.com>
Download mbox | patch
Permalink /patch/65972/
State Accepted
Delegated to: David Miller
Headers show

Comments

Philip Rakity - Sept. 28, 2010, 2:26 p.m.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Sachin Sanap <ssanap@marvell.com>
Signed-off-by: Mark Brown <markb@marvell.com>
---
 drivers/net/pxa168_eth.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 1, 2010, 12:33 a.m.
From: Philip Rakity <prakity@marvell.com>
Date: Tue, 28 Sep 2010 07:26:30 -0700

> Signed-off-by: Philip Rakity <prakity@marvell.com>
> Signed-off-by: Sachin Sanap <ssanap@marvell.com>
> Signed-off-by: Mark Brown <markb@marvell.com>

Your patch is corrupted, did you try to edit it by hand
in something like emacs?

> diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
> index c6eeb38..0f2d41b 100644
> --- a/drivers/net/pxa168_eth.c
> +++ b/drivers/net/pxa168_eth.c
> @@ -4,8 +4,10 @@

This hunk header says there are 8 lines in the hunk beforehand
and 10 lines afterwards.

>   *
>   * Copyright (C) 2010 Marvell International Ltd.
>   *		Sachin Sanap <ssanap@marvell.com>
> + *		Zhangfei Gao <zgao6@marvell.com>
>   *		Philip Rakity <prakity@marvell.com>
>   *		Mark Brown <markb@marvell.com>
>   *
>   * This program is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU General Public License
> -- 
> 1.6.0.4

But clearly there are 8 beforehand and 9 afterwards.

Anyways I fixed this up and added your change, but please be
more careful in the future.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index c6eeb38..0f2d41b 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -4,8 +4,10 @@ 
  *
  * Copyright (C) 2010 Marvell International Ltd.
  *		Sachin Sanap <ssanap@marvell.com>
+ *		Zhangfei Gao <zgao6@marvell.com>
  *		Philip Rakity <prakity@marvell.com>
  *		Mark Brown <markb@marvell.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
-- 
1.6.0.4