kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-xiaomi-chiron/include/linux/netfilter
History
Linus Torvalds ba1eb95cf3 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
2009-03-26 16:11:41 -07:00
..
Kbuild netfilter: xtables: add cluster match 2009-03-16 17:10:36 +01:00
nf_conntrack_amanda.h
nf_conntrack_common.h netfilter: accounting rework: ct_extend + 64bit counters (v4) 2008-07-21 10:10:58 -07:00
nf_conntrack_dccp.h [NETFILTER]: nf_conntrack: add DCCP protocol support 2008-04-14 11:15:49 +02:00
nf_conntrack_ftp.h
nf_conntrack_h323.h [NETFILTER]: Introduce nf_inet_address 2008-01-28 14:59:07 -08:00
nf_conntrack_h323_asn1.h
nf_conntrack_h323_types.h
nf_conntrack_irc.h
nf_conntrack_pptp.h [NETFILTER]: nf_{conntrack,nat}_pptp: annotate PPtP helper with const 2008-01-31 19:28:09 -08:00
nf_conntrack_proto_gre.h netfilter: netns nf_conntrack: GRE conntracking in netns 2008-10-08 11:35:10 +02:00
nf_conntrack_sane.h
nf_conntrack_sctp.h [NETFILTER]: nf_conntrack_sctp: remove unused ttag field from conntrack data 2008-01-28 15:02:38 -08:00
nf_conntrack_sip.h netfilter: nf_conntrack_sip: restrict RTP expect flushing on error to last request 2008-05-08 01:15:21 -07:00
nf_conntrack_tcp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
nf_conntrack_tftp.h
nf_conntrack_tuple_common.h
nfnetlink.h Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
nfnetlink_compat.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
nfnetlink_conntrack.h netfilter: ctnetlink: fix missing CTA_NAT_SEQ_UNSPEC 2008-12-16 01:19:41 -08:00
nfnetlink_log.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
nfnetlink_queue.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
x_tables.h Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
xt_CLASSIFY.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_cluster.h netfilter: xtables: add cluster match 2009-03-16 17:10:36 +01:00
xt_comment.h
xt_connbytes.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_connlimit.h [NETFILTER]: Annotate start of kernel fields in NF headers 2008-01-28 15:02:19 -08:00
xt_CONNMARK.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_connmark.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_CONNSECMARK.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_conntrack.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_dccp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_DSCP.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_dscp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_esp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_hashlimit.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_helper.h
xt_iprange.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_LED.h netfilter: x_tables: add LED trigger target 2009-02-20 10:55:14 +01:00
xt_length.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_limit.h Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
xt_mac.h
xt_mark.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_MARK.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_multiport.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_NFLOG.h Merge commit 'v2.6.29' into core/header-fixes 2009-03-26 18:29:40 +01:00
xt_NFQUEUE.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_owner.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_physdev.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_pkttype.h
xt_policy.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_quota.h netfilter: xtables: avoid pointer to self 2009-03-16 15:35:29 +01:00
xt_RATEEST.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_rateest.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_realm.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_recent.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_sctp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_SECMARK.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_state.h
xt_statistic.h Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
xt_string.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_TCPMSS.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_tcpmss.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_TCPOPTSTRIP.h [NETFILTER]: x_tables: add TCPOPTSTRIP target 2008-01-28 14:55:51 -08:00
xt_tcpudp.h make netfilter use strict integer types 2009-03-26 18:14:20 +01:00
xt_time.h
xt_TPROXY.h netfilter: iptables TPROXY target 2008-10-08 11:35:12 +02:00
xt_u32.h