From 1ba853ea6699d2d2359ac15a85c207fd8f8bf0da Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 1 Feb 2011 16:57:37 +0100
Subject: [PATCH] --- yaml --- r: 236851 b: refs/heads/master c:
 582e1fc85ca3727abd4e99109a267c514ea5c260 h: refs/heads/master i:   236849:
 0468bc1b29468c8ae8d6af6e99bb5a41ba093205   236847:
 468405529b5aca018e5e72f3326829e27b9b97af v: v3

---
 [refs]                                            | 2 +-
 trunk/net/netfilter/ipset/ip_set_bitmap_ip.c      | 1 -
 trunk/net/netfilter/ipset/ip_set_bitmap_ipmac.c   | 3 ---
 trunk/net/netfilter/ipset/ip_set_bitmap_port.c    | 5 -----
 trunk/net/netfilter/ipset/ip_set_hash_ip.c        | 3 ---
 trunk/net/netfilter/ipset/ip_set_hash_ipport.c    | 3 ---
 trunk/net/netfilter/ipset/ip_set_hash_ipportip.c  | 3 ---
 trunk/net/netfilter/ipset/ip_set_hash_ipportnet.c | 3 ---
 trunk/net/netfilter/ipset/ip_set_hash_net.c       | 3 ---
 trunk/net/netfilter/ipset/ip_set_hash_netport.c   | 3 ---
 10 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 89844c64c3fe..82f29de747ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8da560ced56c423cd6d35803cd0244c944c676bd
+refs/heads/master: 582e1fc85ca3727abd4e99109a267c514ea5c260
diff --git a/trunk/net/netfilter/ipset/ip_set_bitmap_ip.c b/trunk/net/netfilter/ipset/ip_set_bitmap_ip.c
index 047440085509..bca96990218d 100644
--- a/trunk/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/trunk/net/netfilter/ipset/ip_set_bitmap_ip.c
@@ -13,7 +13,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/netlink.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/trunk/net/netfilter/ipset/ip_set_bitmap_ipmac.c
index d826332d2937..5e790172deff 100644
--- a/trunk/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/trunk/net/netfilter/ipset/ip_set_bitmap_ipmac.c
@@ -15,9 +15,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/if_ether.h>
 #include <linux/netlink.h>
 #include <linux/jiffies.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_bitmap_port.c b/trunk/net/netfilter/ipset/ip_set_bitmap_port.c
index 92074bb64134..165f09b1a9cb 100644
--- a/trunk/net/netfilter/ipset/ip_set_bitmap_port.c
+++ b/trunk/net/netfilter/ipset/ip_set_bitmap_port.c
@@ -9,13 +9,8 @@
 
 #include <linux/module.h>
 #include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/netlink.h>
 #include <linux/jiffies.h>
 #include <linux/timer.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_ip.c b/trunk/net/netfilter/ipset/ip_set_hash_ip.c
index 53964bc831aa..43bcce200129 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_ip.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_ipport.c b/trunk/net/netfilter/ipset/ip_set_hash_ipport.c
index d9b192818e58..adbe787ea5dc 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_ipport.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_ipport.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_ipportip.c b/trunk/net/netfilter/ipset/ip_set_hash_ipportip.c
index 80dae9de5d18..22e23abb86c6 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_ipportip.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_ipportip.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_ipportnet.c b/trunk/net/netfilter/ipset/ip_set_hash_ipportnet.c
index 8eacd8a46c1c..6033e8b54bbd 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <asm/uaccess.h>
-#include <asm/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_net.c b/trunk/net/netfilter/ipset/ip_set_hash_net.c
index fb0e6a68d13e..c4db202b7da4 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_net.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_net.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
diff --git a/trunk/net/netfilter/ipset/ip_set_hash_netport.c b/trunk/net/netfilter/ipset/ip_set_hash_netport.c
index 342250f9b114..34a165626ee9 100644
--- a/trunk/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/trunk/net/netfilter/ipset/ip_set_hash_netport.c
@@ -12,9 +12,6 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
-#include <linux/uaccess.h>
-#include <linux/bitops.h>
-#include <linux/spinlock.h>
 #include <linux/random.h>
 #include <net/ip.h>
 #include <net/ipv6.h>