David S. Miller d9c7dbc11a Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Conflicts: net/netfilter/xt_TEE.c Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for your net tree, they are: 1) Fix crash when TEE target is used with no --oif, from Eric Dumazet. 2) Oneliner to fix a crash on the redirect traffic to localhost infrastructure when interface has not yet an address, from Munehisa Kamata. 3) Oneliner not to request module all the time from nfnetlink due to wrong type value, from Florian Westphal. I'll make sure these patches 1 and 2 hit -stable. ==================== The conflict in net/netfilter/xt_TEE.c was minor, a change to the 'oif' selection overlapping a function signature change for the nf_dup_ipv{4,6}() routines. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-11-04 20:47:50 -05:00
..
6lowpan	6lowpan: put mcast compression in an own function	2015-10-21 00:49:25 +02:00
9p	net/9p: Remove ib_get_dma_mr calls	2015-08-30 18:12:36 -04:00
802
8021q	vlan: Invoke driver vlan hooks only if device is present	2015-11-03 11:29:56 -05:00
appletalk
atm	atm: deal with setting entry before mkip was called	2015-09-17 22:13:32 -07:00
ax25
batman-adv
bluetooth	bluetooth: 6lowpan: fix NOHZ: local_softirq_pending	2015-10-27 09:53:36 +01:00
bridge	bridge: vlan: Use rcu_dereference instead of rtnl_dereference	2015-11-02 16:27:39 -05:00
caif
can	can: avoid using timeval for uapi	2015-10-13 17:42:34 +02:00
ceph	rbd: use writefull op for object size writes	2015-10-16 16:49:01 +02:00
core	net/core: fix for_each_netdev_feature	2015-11-03 11:29:57 -05:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	tcp/dccp: fix ireq->pktopts race	2015-11-02 15:38:26 -05:00
decnet	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
dns_resolver
dsa	net: dsa: use switchdev obj for VLAN add/del ops	2015-11-01 15:56:11 -05:00
ethernet	net: help compiler generate better code in eth_get_headlen	2015-09-28 22:51:15 -07:00
hsr
ieee802154	net: fix percpu memory leaks	2015-11-02 22:47:14 -05:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-03 13:41:45 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-03 13:41:45 -05:00
ipx
irda	irda: Delete an unnecessary check before the function call "irlmp_unregister_service"	2015-11-03 13:30:47 -05:00
iucv	s390/iucv: do not use arrays as argument	2015-09-21 16:03:04 -07:00
key	af_key: fix two typos	2015-10-23 03:05:19 -07:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-02 07:21:25 -07:00
l3mdev	net: Add netif_is_l3_slave	2015-10-07 04:27:43 -07:00
lapb
llc
mac80211	mac80211: document sleep requirements for channel context ops	2015-11-03 11:15:48 +01:00
mac802154	mac802154: llsec: use kzfree	2015-10-21 00:49:24 +02:00
mpls	mpls: reduce memory usage of routes	2015-10-27 19:52:59 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-11-04 20:47:50 -05:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
netrom
nfc	NFC: nci: non-static functions can not be inline	2015-10-28 06:44:45 +01:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-01 00:15:30 -04:00
packet	ipv4: Pass struct net into ip_defrag and ip_check_defrag	2015-10-12 19:44:16 -07:00
phonet
rds	RDS: convert bind hash table to re-sizable hashtable	2015-11-02 15:36:23 -05:00
rfkill	rfkill: Copy "all" global state to other types	2015-09-04 14:26:56 +02:00
rose
rxrpc	rxrpc: Replace get_seconds with ktime_get_seconds	2015-09-20 21:53:56 -07:00
sched	net: sched: kill dead code in sch_choke.c	2015-11-03 13:30:47 -05:00
sctp	net: sctp: avoid incorrect time_t use	2015-10-05 03:16:48 -07:00
sunrpc	Changes for 4.3-rc5	2015-10-15 13:44:35 -07:00
switchdev	switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion	2015-11-03 13:39:21 -05:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-03 13:41:45 -05:00
unix	af_unix: do not report POLLOUT on listeners	2015-10-25 06:37:45 -07:00
vmw_vsock	VSOCK: define VSOCK_SS_LISTEN once only	2015-11-01 12:14:47 -05:00
wimax
wireless	cfg80211: allow AID/listen interval changes for unassociated station	2015-11-03 11:20:29 +01:00
x25
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2015-10-30 20:51:56 +09:00
compat.c
Kconfig	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
Makefile	net: Introduce L3 Master device abstraction	2015-09-29 20:40:32 -07:00
socket.c
sysctl_net.c	net: sysctl: fix a kmemleak warning	2015-10-23 06:22:08 -07:00