From: David S. Miller Date: Tue, 10 Apr 2012 18:30:45 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=06eb4eafbdc0796d741d139a44f1253278da8611;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git./linux/kernel/git/davem/net --- 06eb4eafbdc0796d741d139a44f1253278da8611 diff --cc net/core/skbuff.c index b2595adb605f,baf8d281152c..a396a6926238 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@@ -66,9 -66,9 +66,8 @@@ #include #include - #include #include - -#include "kmap_skb.h" +#include static struct kmem_cache *skbuff_head_cache __read_mostly; static struct kmem_cache *skbuff_fclone_cache __read_mostly;