Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
  x86: headers cleanup - setup.h
  emu101k1.h: fix duplicate include of <linux/types.h>
  compiler-gcc4: conditionalize #error on __KERNEL__
  remove __KERNEL_STRICT_NAMES
  make netfilter use strict integer types
  make drm headers use strict integer types
  make MTD headers use strict integer types
  make most exported headers use strict integer types
  make exported headers use strict posix types
  unconditionally include asm/types.h from linux/types.h
  make linux/types.h as assembly safe
  Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
  headers_check fix cleanup: linux/reiserfs_fs.h
  headers_check fix cleanup: linux/nubus.h
  headers_check fix cleanup: linux/coda_psdev.h
  headers_check fix: x86, setup.h
  headers_check fix: x86, prctl.h
  headers_check fix: linux/reinserfs_fs.h
  headers_check fix: linux/socket.h
  headers_check fix: linux/nubus.h
  ...

Manually fix trivial conflicts in:
	include/linux/netfilter/xt_limit.h
	include/linux/netfilter/xt_statistic.h

1 files changed, 13 insertions, 13 deletions

diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 0f434a28fb58..148265e63e8d 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -96,10 +96,10 @@
  */
 struct ip_vs_service_user {
         /* virtual service addresses */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual ip address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* virtual service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -119,8 +119,8 @@ struct ip_vs_dest_user {
         int                     weight;         /* destination weight */
 
         /* thresholds for active connections */
-        u_int32_t               u_threshold;    /* upper threshold */
-        u_int32_t               l_threshold;    /* lower threshold */
+        __u32           u_threshold;    /* upper threshold */
+        __u32           l_threshold;    /* lower threshold */
 };
 
 
@@ -159,10 +159,10 @@ struct ip_vs_getinfo {
 /* The argument to IP_VS_SO_GET_SERVICE */
 struct ip_vs_service_entry {
         /* which service: user fills in these */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* service options */
         char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -184,12 +184,12 @@ struct ip_vs_dest_entry {
         unsigned                conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
-        u_int32_t               u_threshold;    /* upper threshold */
-        u_int32_t               l_threshold;    /* lower threshold */
+        __u32           u_threshold;    /* upper threshold */
+        __u32           l_threshold;    /* lower threshold */
 
-        u_int32_t               activeconns;    /* active connections */
-        u_int32_t               inactconns;     /* inactive connections */
-        u_int32_t               persistconns;   /* persistent connections */
+        __u32           activeconns;    /* active connections */
+        __u32           inactconns;     /* inactive connections */
+        __u32           persistconns;   /* persistent connections */
 
         /* statistics */
         struct ip_vs_stats_user stats;
@@ -199,10 +199,10 @@ struct ip_vs_dest_entry {
 /* The argument to IP_VS_SO_GET_DESTS */
 struct ip_vs_get_dests {
         /* which service: user fills in these */
-        u_int16_t               protocol;
+        __u16           protocol;
         __be32                  addr;           /* virtual address */
         __be16                  port;
-        u_int32_t               fwmark;         /* firwall mark of service */
+        __u32           fwmark;         /* firwall mark of service */
 
         /* number of real servers */
         unsigned int            num_dests;