| Message ID | alpine.LNX.2.00.1106201028340.18991@swampdragon.chaosbits.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jesper Juhl <jj@chaosbits.net> 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 <jj@chaosbits.net> Applied. -- 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, It's already in Jiri's trivial tree. Vitaliy Sent from my iPhone On Jun 20, 2011, at 23:05, David Miller <davem@davemloft.net> wrote: > From: Jesper Juhl <jj@chaosbits.net> > 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 <jj@chaosbits.net> > > Applied. > -- > To unsubscribe from this list: send the line "unsubscribe linux- > kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- 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
From: Vitaliy Ivanov <vitalivanov@gmail.com> 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 :-) -- 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
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.
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>
Remove the duplicate inclusion of net/icmp.h from net/ipv4/ping.c Signed-off-by: Jesper Juhl <jj@chaosbits.net> --- ping.c | 1 - 1 file changed, 1 deletion(-)