David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

2012-07-19 11:17:30 -07:00

..

ipset

netfilter: ipset: fix crash if IPSET_CMD_NONE command is sent

2012-06-29 13:04:04 +02:00

ipvs

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-07-19 11:17:30 -07:00

core.c

netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y

2012-06-22 02:49:52 +02:00

Kconfig

netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled

2012-06-19 04:44:57 +02:00

Makefile

netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled

2012-06-19 04:44:57 +02:00

nf_conntrack_acct.c

…

nf_conntrack_amanda.c

…

nf_conntrack_broadcast.c

…

nf_conntrack_core.c

…

nf_conntrack_ecache.c

…

nf_conntrack_expect.c

…

nf_conntrack_extend.c

…

nf_conntrack_ftp.c

…

nf_conntrack_h323_asn1.c

…

nf_conntrack_h323_main.c

…

nf_conntrack_h323_types.c

…

nf_conntrack_helper.c

…

nf_conntrack_irc.c

…

nf_conntrack_l3proto_generic.c

…

nf_conntrack_netbios_ns.c

…

nf_conntrack_netlink.c

netfilter: ctnetlink: add new messages to obtain statistics

2012-06-27 17:28:03 +02:00

nf_conntrack_pptp.c

…

nf_conntrack_proto_dccp.c

netfilter: nf_ct_dccp: add dccp_kmemdup_sysctl_table function

2012-06-27 19:14:31 +02:00

nf_conntrack_proto_generic.c

netfilter: nf_conntrack: generalize nf_ct_l4proto_net

2012-07-04 19:37:22 +02:00

nf_conntrack_proto_gre.c

netfilter: nf_conntrack: prepare l4proto->init_net cleanup

2012-06-27 18:31:14 +02:00

nf_conntrack_proto_sctp.c

netfilter: nf_ct_sctp: merge sctpv[4,6]_net_init into sctp_net_init

2012-06-27 19:13:31 +02:00

nf_conntrack_proto_tcp.c

netfilter: nf_ct_tcp: missing per-net support for cttimeout

2012-07-04 19:37:42 +02:00

nf_conntrack_proto_udp.c

netfilter: nf_conntrack: generalize nf_ct_l4proto_net

2012-07-04 19:37:22 +02:00

nf_conntrack_proto_udplite.c

netfilter: nf_ct_udplite: add udplite_kmemdup_sysctl_table function

2012-06-27 19:12:52 +02:00

nf_conntrack_proto.c

netfilter: nf_conntrack: generalize nf_ct_l4proto_net

2012-07-04 19:37:22 +02:00

nf_conntrack_sane.c

…

nf_conntrack_sip.c

…

nf_conntrack_snmp.c

…

nf_conntrack_standalone.c

…

nf_conntrack_tftp.c

…

nf_conntrack_timeout.c

…

nf_conntrack_timestamp.c

…

nf_internals.h

…

nf_log.c

…

nf_queue.c

…

nf_sockopt.c

…

nf_tproxy_core.c

…

nfnetlink_acct.c

…

nfnetlink_cthelper.c

…

nfnetlink_cttimeout.c

…

nfnetlink_log.c

netfilter: nfnetlink_log: Move away from NLMSG_PUT().

2012-06-26 21:34:03 -07:00

nfnetlink_queue_core.c

netfilter: nfnetlink_queue: do not allow to set unsupported flag bits

2012-07-04 19:51:50 +02:00

nfnetlink_queue_ct.c

netfilter: nfnetlink_queue: fix sparse warning due to missing include

2012-06-23 02:13:38 +02:00

nfnetlink.c

Merge branch 'master' of git://1984.lsi.us.es/nf-next

2012-07-07 16:18:50 -07:00

x_tables.c

…

xt_addrtype.c

…

xt_AUDIT.c

…

xt_CHECKSUM.c

…

xt_CLASSIFY.c

…

xt_cluster.c

…

xt_comment.c

…

xt_connbytes.c

…

xt_connlimit.c

…

xt_connmark.c

…

xt_CONNSECMARK.c

…

xt_conntrack.c

…

xt_cpu.c

…

xt_CT.c

…

xt_dccp.c

…

xt_devgroup.c

…

xt_dscp.c

…

xt_DSCP.c

…

xt_ecn.c

…

xt_esp.c

…

xt_hashlimit.c

…

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_HMARK.c

…

xt_IDLETIMER.c

…

xt_iprange.c

…

xt_ipvs.c

…

xt_LED.c

…

xt_length.c

…

xt_limit.c

…

xt_LOG.c

…

xt_mac.c

…

xt_mark.c

…

xt_multiport.c

…

xt_nfacct.c

…

xt_NFLOG.c

…

xt_NFQUEUE.c

…

xt_NOTRACK.c

…

xt_osf.c

…

xt_owner.c

…

xt_physdev.c

…

xt_pkttype.c

…

xt_policy.c

…

xt_quota.c

…

xt_rateest.c

…

xt_RATEEST.c

…

xt_realm.c

…

xt_recent.c

…

xt_repldata.h

…

xt_sctp.c

…

xt_SECMARK.c

…

xt_set.c

netfilter: ipset: timeout fixing bug broke SET target special timeout value

2012-07-09 10:53:04 +02:00

xt_socket.c

…

xt_state.c

…

xt_statistic.c

…

xt_string.c

…

xt_tcpmss.c

…

xt_TCPMSS.c

…

xt_TCPOPTSTRIP.c

…

xt_tcpudp.c

…

xt_TEE.c

…

xt_time.c

…

xt_TPROXY.c

net: Fix (nearly-)kernel-doc comments for various functions

2012-07-10 23:13:45 -07:00

xt_TRACE.c

…

xt_u32.c

…