David S. Miller f8785c5514 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables ... Pablo Neira Ayuso says: ==================== This batch contains fives nf_tables patches for your net-next tree, they are: * Fix possible use after free in the module removal path of the x_tables compatibility layer, from Dan Carpenter. * Add filter chain type for the bridge family, from myself. * Fix Kconfig dependencies of the nf_tables bridge family with the core, from myself. * Fix sparse warnings in nft_nat, from Tomasz Bursztyka. * Remove duplicated include in the IPv4 family support for nf_tables, from Wei Yongjun. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 19:48:57 -05:00
..
9p	for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window	2013-09-11 12:34:13 -07:00
802	mrp: add periodictimer to allow retries when packets get lost	2013-09-23 16:53:52 -04:00
8021q	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
appletalk	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
atm
ax25	ax25: cleanup a range test	2013-10-18 13:56:07 -04:00
batman-adv	batman-adv: generalize batman-adv icmp packet handling	2013-10-23 17:03:47 +02:00
bluetooth	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
bridge	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables	2013-11-04 19:48:57 -05:00
caif	caif: Add missing braces to multiline if in cfctrl_linkup_request	2013-09-05 14:31:02 -04:00
can	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
ceph	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
core	net: checksum: fix warning in skb_checksum	2013-11-04 15:27:08 -05:00
dcb
dccp	net: dccp: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
decnet	netfilter: pass hook ops to hookfn	2013-10-14 11:29:31 +02:00
dns_resolver	net: strict_strtoul is obsolete, use kstrtoul instead	2013-07-12 16:09:14 -07:00
dsa	net: dsa: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:49 -04:00
ethernet	ethernet: use likely() for common Ethernet encap	2013-09-30 21:52:53 -07:00
hsr	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
ieee802154	6lowpan: cleanup skb copy data	2013-10-30 17:18:46 -04:00
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables	2013-11-04 19:48:57 -05:00
ipv6	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2013-11-04 19:46:58 -05:00
ipx	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
irda	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
iucv	net: delete __cpuinit usage from all net files	2013-07-14 19:36:58 -04:00
key	xfrm: Guard IPsec anti replay window against replay bitmap	2013-09-17 12:17:10 +02:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
lapb	net/lapb: re-send packets on timeout	2013-09-23 16:52:45 -04:00
llc	llc: Use normal etherdevice.h tests	2013-09-03 22:34:47 -04:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
mac802154	6lowpan: set and use mac_len for mac header length	2013-10-30 17:18:46 -04:00
mpls	ipip: add GSO/TSO support	2013-10-19 19:36:19 -04:00
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables	2013-11-04 19:48:57 -05:00
netlabel	inet: includes a sock_common in request_sock	2013-10-10 00:08:07 -04:00
netlink	net: netlink: filter particular protocols from analyzers	2013-09-06 14:43:48 -04:00
netrom
nfc	NFC: Update secure element state	2013-08-14 01:13:40 +02:00
openvswitch	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch	2013-11-04 16:25:04 -05:00
packet	net: packet: use reciprocal_divide in fanout_demux_hash	2013-08-29 16:43:29 -04:00
phonet	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
rds	inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once	2013-10-19 19:45:35 -04:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
rose
rxrpc	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
sunrpc	net: fix build errors if ipv6 is disabled	2013-10-09 13:04:03 -04:00
tipc	tipc: remove two indentation levels in tipc_recv_msg routine	2013-10-30 16:54:54 -04:00
unix	net: unix: inherit SOCK_PASS{CRED, SEC} flags from socket to fix race	2013-10-19 18:50:15 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-16 15:37:26 -07:00
wimax	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
x25	net: x25: Fix dead URLs in Kconfig	2013-10-29 17:35:17 -04:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
compat.c	net: heap overflow in __audit_sockaddr()	2013-10-03 16:05:14 -04:00
Kconfig	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
Makefile	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
nonet.c
socket.c	net: heap overflow in __audit_sockaddr()	2013-10-03 16:05:14 -04:00
sysctl_net.c	net: Update the sysctl permissions handler to test effective uid/gid	2013-10-07 15:57:56 -04:00