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

Conflicts:
	net/netfilter/nfnetlink_log.c
	net/netfilter/xt_LOG.c

Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.

Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-09-15 11:43:53 -04:00

..

ebt_802_3.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_among.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_arp.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_arpreply.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ebt_dnat.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ebt_ip6.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

ebt_ip.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_limit.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_log.c

netfilter: log: Fix log-level processing

2012-09-12 17:17:35 +02:00

ebt_mark_m.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_mark.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ebt_nflog.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ebt_pkttype.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ebt_redirect.c

bridge: use rx_handler_data pointer to store net_bridge_port pointer

2010-06-15 11:48:58 -07:00

ebt_snat.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ebt_stp.c

bridge: netfilter: Convert compare_ether_addr to ether_addr_equal

2012-05-09 20:49:17 -04:00

ebt_ulog.c

netlink: hide struct module parameter in netlink_kernel_create

2012-09-08 18:46:30 -04:00

ebt_vlan.c

vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.

2010-10-21 01:26:50 -07:00

ebtable_broute.c

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02 04:29:23 -07:00

ebtable_filter.c

netfilter: PTR_RET can be used

2012-08-14 02:31:47 +02:00

ebtable_nat.c

netfilter: PTR_RET can be used

2012-08-14 02:31:47 +02:00

ebtables.c

netfilter: bridge: fix wrong pointer dereference

2012-03-06 14:43:49 -05:00

Kconfig

netfilter: ebtables: fix ebtables build dependency

2011-07-29 16:40:30 +02:00

Makefile

bridge: fix IPV6=n build

2008-06-17 16:16:13 -07:00