Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilepro.c
Simple merge

diff --cc drivers/net/usb/asix.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
Simple merge

diff --cc include/net/dst.h
Simple merge

diff --cc include/net/flow.h
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/bluetooth/hci_conn.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
index 26dc3f6,17b5b1c..9bc22e4
--- 1/net/bluetooth/l2cap_core.c
--- 2/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -2372,8 -2152,7 +2372,8 @@@ static int l2cap_parse_conf_rsp(struct 
        void *ptr = req->data;
        int type, olen;
        unsigned long val;
-       struct l2cap_conf_rfc rfc;
+       struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
 +      struct l2cap_conf_efs efs;
  
        BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
  

diff --cc net/bluetooth/rfcomm/core.c
Simple merge

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ipconfig.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge