Merge branch 'topic/uek-4.1/stable-cherry-picks' of git://ca-git.us.oracle.com/linux...

* topic/uek-4.1/stable-cherry-picks: (96 commits)
  KEYS: Fix race between read and revoke
  rhashtable: Fix walker list corruption
  tcp: restore fastopen with no data in SYN packet
  fou: clean up socket with kfree_rcu
  rhashtable: Enforce minimum size on initial hash table
  net: fix uninitialized variable issue
  bluetooth: Validate socket address length in sco_sock_bind().
  net: check both type and procotol for tcp sockets
  skbuff: Fix offset error in skb_reorder_vlan_header
  pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
  net: fix IP early demux races
  sh_eth: fix kernel oops in skb_put()
  net: add validation for the socket syscall protocol argument
  ipv6: sctp: clone options to avoid use after free
  vxlan: fix incorrect RCO bit in VXLAN header
  ipv6: keep existing flags when setting IFA_F_OPTIMISTIC
  pppoe: fix memory corruption in padt work structure
  usb: core : hub: Fix BOS 'NULL pointer' kernel panic
  nfs4: start callback_ident at idr 1
  nfsd: eliminate sending duplicate and repeated delegations
  ...

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/block/nvme-core.c
index b1b808cf375bcb66157e2234592b46eba28c9807,04c0e8f3183c3630684ef621d3170307bcf8606e..231360935e6464511db27ffa2946cfcc95a2d122
--- 1/drivers/block/nvme-core.c
--- 2/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@@ -619,16 -605,9 +621,16 @@@ static void req_completion(struct nvme_
                        if (!blk_queue_stopped(req->q))
                                blk_mq_kick_requeue_list(req->q);
                        spin_unlock_irqrestore(req->q->queue_lock, flags);
-                       return;
+                       goto release_iod;
                }
 -              req->errors = nvme_error_status(status);
 +              if (req->cmd_type == REQ_TYPE_SPECIAL) {
 +                      if (cmd_rq->ctx == CMD_CTX_CANCELLED)
 +                              req->errors = -EINTR;
 +                      else
 +                              req->errors = status;
 +              } else {
 +                      req->errors = nvme_error_status(status);
 +              }
        } else
                req->errors = 0;
  

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx4/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/eq.c
Simple merge

diff --cc drivers/net/ppp/pppoe.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

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

diff --cc kernel/module.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc net/ax25/af_ax25.c
Simple merge

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

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

diff --cc net/decnet/af_decnet.c
Simple merge

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

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

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

diff --cc net/irda/af_irda.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

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

diff --cc net/rds/tcp_recv.c
Simple merge

diff --cc net/sctp/ipv6.c
index e703ff7fed40a88676d8c4a8919a766fa86365de,3267a5cbb3e86bd12122dab1c415e629022aeb1c..05a295b75b33ec880e180a4c8677cb3cfbefd72b
--- 1/net/sctp/ipv6.c
--- 2/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@@ -634,8 -634,9 +634,9 @@@ static struct sock *sctp_v6_create_acce
        struct sock *newsk;
        struct ipv6_pinfo *newnp, *np = inet6_sk(sk);
        struct sctp6_sock *newsctp6sk;
+       struct ipv6_txoptions *opt;
  
 -      newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot);
 +      newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot, 0);
        if (!newsk)
                goto out;
  

diff --cc net/socket.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge