David S. Miller 4e7a84b1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ... Pablo Neira Ayuso says: ==================== netfilter updates for net-next The following patchset contains netfilter updates for net-next, just a bunch of cleanups and small enhancement to selectively flush conntracks in ctnetlink, more specifically the patches are: 1) Rise default number of buckets in conntrack from 16384 to 65536 in systems with >= 4GBytes, patch from Marcelo Leitner. 2) Small refactor to save one level on indentation in xt_osf, from Joe Perches. 3) Remove unnecessary sizeof(char) in nf_log, from Fabian Frederick. 4) Another small cleanup to remove redundant variable in nfnetlink, from Duan Jiong. 5) Fix compilation warning in nfnetlink_cthelper on parisc, from Chen Gang. 6) Fix wrong format in debugging for ctseqadj, from Gao feng. 7) Selective conntrack flushing through the mark for ctnetlink, patch from Kristian Evensen. 8) Remove nf_ct_conntrack_flush_report() exported symbol now that is not required anymore after the selective flushing patch, again from Kristian. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 01:50:25 -05:00
..
6lowpan	net/6lowpan: Remove FSF address from GPL statement.	2014-12-05 12:43:04 +01:00
9p	9p/trans_virtio: enable VQs early	2014-10-15 10:25:04 +10:30
802	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
8021q	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
appletalk	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
atm	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
ax25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
batman-adv	batman-adv: Kconfig, Add missing DEBUG_FS dependency	2015-01-07 22:17:11 +01:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2015-01-02 15:58:21 -05:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
caif	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
can	can: fix spelling errors	2014-12-07 21:22:05 +01:00
ceph	libceph: fix sparse endianness warnings	2015-01-08 20:36:57 +03:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
dcb	dcbnl : Disable software interrupts before taking dcb_lock	2014-11-16 14:50:52 -05:00
dccp	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
decnet	net: tcp: add RTAX_CC_ALGO fib handling	2015-01-05 22:55:24 -05:00
dns_resolver	Merge commit 'v3.16' into next	2014-10-01 00:44:04 +10:00
dsa	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
ethernet	net: Add Transparent Ethernet Bridging GRO support.	2015-01-02 15:46:41 -05:00
hsr	net/hsr: Remove left-over never-true conditional code.	2014-07-11 15:04:40 -07:00
ieee802154	nl802154: introduce support for cca settings	2014-12-19 00:19:23 +01:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
ipx	switch ipxrtr_route_packet() from iovec to msghdr	2014-11-24 04:28:49 -05:00
irda	irda: Convert function pointer arrays and uses to const	2014-12-10 15:33:16 -05:00
iucv	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
key	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
l2tp	l2tp : multicast notification to the registered listeners	2014-12-31 14:17:20 -05:00
lapb	lapb: move EXPORT_SYMBOL after functions.	2014-10-24 15:51:42 -04:00
llc	llc: Make llc_sap_action_t function pointer arrays const	2014-12-10 15:21:24 -05:00
mac80211	Revert "mac80211: Fix accounting of the tailroom-needed counter"	2015-01-05 10:33:46 +01:00
mac802154	ieee802154: iface: move multiple node type check	2014-12-20 00:06:55 +01:00
mpls	mpls: Fix allowed protocols for mpls gso	2014-12-23 23:57:31 -05:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-01-15 01:50:25 -05:00
netlabel	netlabel: kernel-doc warning fix	2014-10-09 01:40:05 -04:00
netlink	netlink: eliminate nl_sk_hash_lock	2015-01-13 14:01:00 -05:00
netrom	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
nfc	Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-12-09 18:12:03 -05:00
openvswitch	openvswitch: Support VXLAN Group Policy extension	2015-01-15 01:11:41 -05:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
phonet	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
rds	rds: Fix min() warning in rds_message_inc_copy_to_user()	2014-12-15 11:49:09 -05:00
rfkill	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
rose	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
rxrpc	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
sched	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
sctp	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
sunrpc	rpc: fix xdr_truncate_encode to handle buffer ending on page boundary	2015-01-07 14:03:58 -05:00
switchdev	bridge: call netdev_sw_port_stp_update when bridge port STP status changes	2014-12-02 20:01:22 -08:00
tipc	tipc: correctly handle releasing a not fully initialized sock	2015-01-13 17:26:27 -05:00
unix	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
vmw_vsock	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
wimax	wimax: convert printk to pr_foo()	2014-10-07 20:28:44 -04:00
wireless	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
x25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
xfrm	net: xfrm: xfrm_algo: Remove unused function	2015-01-12 16:50:46 -05:00
compat.c	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
Kconfig	net: introduce generic switch devices support	2014-12-02 20:01:20 -08:00
Makefile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-16 15:53:03 -08:00
socket.c	[regression] chunk lost from bd9b51	2014-12-19 07:13:21 -05:00
sysctl_net.c