David S. Miller b640bee6d9 Merge branch 'master' of git://1984.lsi.us.es/nf-next ... Pablo Neira Ayuso says: ==================== This batch contains netfilter updates for you net-next tree, they are: * The new connlabel extension for x_tables, that allows us to attach labels to each conntrack flow. The kernel implementation uses a bitmask and there's a file in user-space that maps the bits with the corresponding string for each existing label. By now, you can attach up to 128 overlapping labels. From Florian Westphal. * A new round of improvements for the netns support for conntrack. Gao feng has moved many of the initialization code of each module of the netns init path. He also made several code refactoring, that code looks cleaner to me now. * Added documentation for all possible tweaks for nf_conntrack via sysctl, from Jiri Pirko. * Cisco 7941/7945 IP phone support for our SIP conntrack helper, from Kevin Cernekee. * Missing header file in the snmp helper, from Stephen Hemminger. * Finally, a couple of fixes to resolve minor issues with these changes, from myself. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-27 00:56:10 -05:00
..
9p	virtio: 9p: correctly pass physical address to userspace for high pages	2012-10-22 18:19:36 +10:30
802	…
8021q	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
appletalk	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
atm	atm: use scnprintf() instead of sprintf()	2012-12-17 20:50:51 -08:00
ax25	userns: Convert net/ax25 to use kuid_t where appropriate	2012-08-14 21:49:42 -07:00
batman-adv	batman-adv: Start new development cycle	2013-01-19 21:18:13 +08:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-12-13 12:00:48 -08:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
caif	caif_usb: Make the driver name check more efficient	2012-12-09 00:34:02 -05:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-01-02 17:32:49 -08:00
core	soreuseport: infrastructure	2013-01-23 13:44:00 -05:00
dcb	net: Allow DCBnl to use other namespaces besides init_net	2012-12-10 14:09:01 -05:00
dccp	inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock	2012-12-14 13:14:07 -05:00
decnet	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
dns_resolver	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
dsa	dsa: make dsa_switch_setup check for valid port names	2013-01-21 15:40:12 -05:00
ethernet	net: split eth_mac_addr for better error handling	2013-01-21 14:07:44 -05:00
ieee802154	6lowpan: Handle uncompressed IPv6 packets over 6LoWPAN	2013-01-18 14:18:30 -05:00
ipv4	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-01-27 00:56:10 -05:00
ipv6	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-01-27 00:56:10 -05:00
ipx	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
irda	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
iucv	s390/irq: remove split irq fields from /proc/stat	2013-01-08 10:57:07 +01:00
key	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
lapb	…
llc	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
mac80211	mac80211: fix maximum MTU	2013-01-03 13:00:01 +01:00
mac802154	mac802154: fix NOHZ local_softirq_pending 08 warning	2013-01-04 13:47:21 -08:00
netfilter	netfilter: nf_conntrack: fix compilation if sysctl are disabled	2013-01-23 15:14:31 +01:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
netlink	netlink: Use FIELD_SIZEOF() in netlink_proto_init().	2013-01-09 23:38:23 -08:00
netrom	net: change return values from -EACCES to -EPERM	2012-09-21 13:58:08 -04:00
nfc	nfc: remove noisy message from llcp_sock_sendmsg	2012-12-13 12:58:10 -05:00
openvswitch	openvswitch: Use FIELD_SIZEOF() in dp_init().	2013-01-09 23:38:24 -08:00
packet	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
phonet	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
rds	IB/rds: suppress incompatible protocol when version is known	2012-12-26 15:17:37 -08:00
rfkill	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
rose	…
rxrpc	rxrpc: Use FIELD_SIZEOF() in af_rxrpc_init().	2013-01-09 23:38:24 -08:00
sched	pkt_sched: namespace aware act_mirred	2013-01-14 15:09:36 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
sunrpc	NFS client bugfixe for Linux 3.8	2013-01-11 12:09:04 -08:00
tipc	tipc: refactor accept() code for improved readability	2012-12-07 17:23:24 -05:00
unix	unix: Use FIELD_SIZEOF() in af_unix_init().	2013-01-09 23:38:24 -08:00
wanrouter	wanmain: comparing array with NULL	2012-07-24 13:55:21 -07:00
wimax	…
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
x25	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
xfrm	xfrm: use separated locks to protect pointers of struct xfrm_state_afinfo	2013-01-17 10:03:57 +01:00
Kconfig	net: Add support for XPS without sysfs being defined	2013-01-10 22:47:04 -08:00
Makefile	ipv6: Preserve ipv6 functionality needed by NET	2012-11-18 02:34:00 -05:00
compat.c	make get_file() return its argument	2012-09-26 21:10:25 -04:00
nonet.c	…
socket.c	cgroup: net_cls: Rework update socket logic	2012-10-26 03:40:51 -04:00
sysctl_net.c	user_ns: get rid of duplicate code in net_ctl_permissions	2012-11-18 20:32:45 -05:00