Merge remote-tracking branch 'net-next/master'

Conflicts:
	net/bluetooth/l2cap_core.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

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/Makefile
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8842.c
Simple merge

diff --cc drivers/net/ethernet/natsemi/macsonic.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/wireless/iwlwifi/iwl-trans-pcie.c
Simple merge

diff --cc include/net/sctp/structs.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 17b5b1cd96579e352b2f3bff0bb5d9b7d9406ff2,26dc3f6a8346714f36cf1bd59349193c11f1415d..9bc22e4c4c616249196ebc1b14fb2209c8e7a44f
--- 1/net/bluetooth/l2cap_core.c
--- 2/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -2152,7 -2372,8 +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/ipv4/ipconfig.c
Simple merge

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

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

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc net/sunrpc/svc_xprt.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge