Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Thu, 26 Mar 2009 23:11:41 +0000 (16:11 -0700)]
* '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  2 
arch/ia64/include/asm/kvm.h
arch/powerpc/include/asm/kvm.h
include/linux/netfilter/nfnetlink.h
include/linux/netfilter/x_tables.h
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
include/linux/socket.h
include/sound/asound.h

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -9,14 -9,15 +11,14 @@@ struct xt_limit_priv
  /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
     seconds, or one every 59 hours. */
  struct xt_rateinfo {
-       u_int32_t avg;    /* Average secs between packets * scale */
-       u_int32_t burst;  /* Period multiplier for upper limit. */
+       __u32 avg;    /* Average secs between packets * scale */
+       __u32 burst;  /* Period multiplier for upper limit. */
  
        /* Used internally by the kernel */
 -      unsigned long prev;
 -      __u32 credit;
 +      unsigned long prev; /* moved to xt_limit_priv */
-       u_int32_t credit; /* moved to xt_limit_priv */
-       u_int32_t credit_cap, cost;
++      __u32 credit; /* moved to xt_limit_priv */
+       __u32 credit_cap, cost;
  
 -      /* Ugly, ugly fucker. */
 -      struct xt_rateinfo *master;
 +      struct xt_limit_priv *master;
  };
  #endif /*_XT_RATE_H*/
@@@ -13,22 -15,21 +15,22 @@@ enum xt_statistic_flags 
  };
  #define XT_STATISTIC_MASK             0x1
  
 +struct xt_statistic_priv;
 +
  struct xt_statistic_info {
-       u_int16_t                       mode;
-       u_int16_t                       flags;
+       __u16                   mode;
+       __u16                   flags;
        union {
                struct {
-                       u_int32_t       probability;
+                       __u32   probability;
                } random;
                struct {
-                       u_int32_t       every;
-                       u_int32_t       packet;
-                       u_int32_t       count; /* unused */
+                       __u32   every;
+                       __u32   packet;
 -                      /* Used internally by the kernel */
 -                      __u32   count;
++                      __u32   count; /* unused */
                } nth;
        } u;
 -      struct xt_statistic_info        *master __attribute__((aligned(8)));
 +      struct xt_statistic_priv *master __attribute__((aligned(8)));
  };
  
  #endif /* _XT_STATISTIC_H */
Simple merge
Simple merge