kernel-ark/include/linux/netfilter
Linus Torvalds cee4cca740 Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h
2006-06-20 15:10:08 -07:00
..
nf_conntrack_common.h [NETFILTER]: conntrack: add fixed timeout flag in connection tracking 2006-06-17 21:28:59 -07:00
nf_conntrack_ftp.h
nf_conntrack_sctp.h
nf_conntrack_tcp.h
nf_conntrack_tuple_common.h
nfnetlink_conntrack.h [NETFILTER]: ctnetlink: fix NAT configuration 2006-06-17 21:29:01 -07:00
nfnetlink_log.h
nfnetlink_queue.h
nfnetlink.h [NETFILTER]: ctnetlink: avoid unneccessary event message generation 2006-03-20 18:03:59 -08:00
x_tables.h [NETFILTER] x_tables: fix compat related crash on non-x86 2006-05-01 20:48:32 -07:00
xt_CLASSIFY.h
xt_comment.h
xt_connbytes.h
xt_connmark.h
xt_CONNMARK.h
xt_CONNSECMARK.h [SECMARK]: Add CONNSECMARK xtables target 2006-06-17 21:30:03 -07:00
xt_conntrack.h Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. 2006-05-04 01:42:36 +01:00
xt_dccp.h
xt_esp.h [NETFILTER]: x_tables: unify IPv4/IPv6 esp match 2006-04-01 02:22:30 -08:00
xt_helper.h
xt_length.h
xt_limit.h
xt_mac.h
xt_mark.h
xt_MARK.h
xt_multiport.h [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match 2006-04-01 02:22:54 -08:00
xt_NFQUEUE.h
xt_physdev.h
xt_pkttype.h
xt_policy.h [NETFILTER]: x_tables: replace IPv4/IPv6 policy match by address family independant version 2006-03-20 18:03:40 -08:00
xt_quota.h [NETFILTER]: x_tables: add quota match 2006-06-17 21:28:49 -07:00
xt_realm.h
xt_sctp.h
xt_SECMARK.h [SECMARK]: Add xtables SECMARK target 2006-06-17 21:29:59 -07:00
xt_state.h
xt_statistic.h [NETFILTER]: x_tables: add statistic match 2006-06-17 21:28:51 -07:00
xt_string.h
xt_tcpmss.h
xt_tcpudp.h