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

* 'topic/uek-4.1/stable-cherry-picks' of git://ca-git.us.oracle.com/linux-uek: (160 commits)
  Linux 4.1.9
  cxl: Don't remove AFUs/vPHBs in cxl_reset
  ipv4: off-by-one in continuation handling in /proc/net/route
  net: dsa: Do not override PHY interface if already configured
  inet: fix races with reqsk timers
  inet: fix possible request socket leak
  netlink: make sure -EBUSY won't escape from netlink_insert
  bna: fix interrupts storm caused by erroneous packets
  bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute size and policy
  bridge: netlink: account for the IFLA_BRPORT_PROXYARP attribute size and policy
  udp: fix dst races with multicast early demux
  rds: fix an integer overflow test in rds_info_getsockopt()
  rocker: free netdevice during netdevice removal
  net: sched: fix refcount imbalance in actions
  act_bpf: fix memory leaks when replacing bpf programs
  packet: tpacket_snd(): fix signed/unsigned comparison
  packet: missing dev_put() in packet_do_bind()
  fib_trie: Drop unnecessary calls to leaf_pull_suffix
  net/mlx4_core: Fix wrong index in propagating port change event to VFs
  bridge: netlink: fix slave_changelink/br_setport race conditions
  ...

diff --cc Makefile
Simple merge

diff --cc drivers/infiniband/core/uverbs.h
Simple merge

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

diff --cc drivers/infiniband/core/uverbs_main.c
index 229772bb4050bca0283fb5378f0c49466b778a72,09686d49d4c14849c367d6d0f0aba2f6f7f907c7..59bf2aca2036efc5254dd6454dd5cc05d7a8c35a
--- 1/drivers/infiniband/core/uverbs_main.c
--- 2/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@@ -153,24 -129,18 +153,28 @@@ static int (*uverbs_ex_cmd_table[])(str
  static void ib_uverbs_add_one(struct ib_device *device);
  static void ib_uverbs_remove_one(struct ib_device *device);
  
- static void ib_uverbs_release_dev(struct kref *ref)
 +static void release_uobj(struct kref *kref)
 +{
 +      kfree(container_of(kref, struct ib_uobject, ref));
 +}
 +
 +static void put_uobj(struct ib_uobject *uobj)
 +{
 +      kref_put(&uobj->ref, release_uobj);
 +}
 +
+ static void ib_uverbs_release_dev(struct kobject *kobj)
  {
        struct ib_uverbs_device *dev =
-               container_of(ref, struct ib_uverbs_device, ref);
+               container_of(kobj, struct ib_uverbs_device, kobj);
  
-       complete(&dev->comp);
+       kfree(dev);
  }
  
+ static struct kobj_type ib_uverbs_dev_ktype = {
+       .release = ib_uverbs_release_dev,
+ };
+ 
  static void ib_uverbs_release_event_file(struct kref *ref)
  {
        struct ib_uverbs_event_file *file =

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

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

diff --cc drivers/infiniband/hw/qib/qib_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

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

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/core/rtnetlink.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/info.c
Simple merge

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

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

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