2011-06-20 08:40:08

by Jesper Juhl

[permalink] [raw]
Subject: [PATCH][Trivial]: ipv4, ping: Remove duplicate icmp.h include

Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c

Signed-off-by: Jesper Juhl <[email protected]>
---
ping.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 9aaa671..39b403f 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -41,7 +41,6 @@
#include <linux/proc_fs.h>
#include <net/sock.h>
#include <net/ping.h>
-#include <net/icmp.h>
#include <net/udp.h>
#include <net/route.h>
#include <net/inet_common.h>

--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.


2011-06-20 20:06:02

by David Miller

[permalink] [raw]
Subject: Re: [PATCH][Trivial]: ipv4, ping: Remove duplicate icmp.h include

From: Jesper Juhl <[email protected]>
Date: Mon, 20 Jun 2011 10:31:20 +0200 (CEST)

> Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c
>
> Signed-off-by: Jesper Juhl <[email protected]>

Applied.

2011-06-20 20:51:28

by Vitaliy Ivanov

[permalink] [raw]
Subject: Re: [PATCH][Trivial]: ipv4, ping: Remove duplicate icmp.h include

David,

It's already in Jiri's trivial tree.

Vitaliy

Sent from my iPhone

On Jun 20, 2011, at 23:05, David Miller <[email protected]> wrote:

> From: Jesper Juhl <[email protected]>
> Date: Mon, 20 Jun 2011 10:31:20 +0200 (CEST)
>
>> Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c
>>
>> Signed-off-by: Jesper Juhl <[email protected]>
>
> Applied.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-
> kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2011-06-20 20:53:13

by David Miller

[permalink] [raw]
Subject: Re: [PATCH][Trivial]: ipv4, ping: Remove duplicate icmp.h include

From: Vitaliy Ivanov <[email protected]>
Date: Mon, 20 Jun 2011 23:50:38 +0300

> It's already in Jiri's trivial tree.

And now it's in mine, no harm :-)

2011-06-20 20:53:25

by Jiri Kosina

[permalink] [raw]
Subject: Re: [PATCH][Trivial]: ipv4, ping: Remove duplicate icmp.h include

On Mon, 20 Jun 2011, Vitaliy Ivanov wrote:

> David,
>
> It's already in Jiri's trivial tree.

Yeah, it's in my tree as part of larger tree-wide patch.

But that's not a problem really, git can handle that just perfectly well.

--
Jiri Kosina
SUSE Labs