From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Fri, 10 Jul 2015 00:18:43 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed.rds-p1' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~319^2^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=228d2d53b4e165aae0977204e60d79bb924ca197;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed.rds-p1' into topic/uek-4.1/ofed

* topic/uek-4.1/ofed.rds-p1: (126 commits)
  rds: UNDO reverts done for rebase code to compile with Linux 4.1 APIs
  rds: port to UEK4, Linux-3.18*
  rds: disable APM support
  rds: disable cq balance
  rds: move linux/rds.h to uapi/linux/rds.h
  RDS: Kconfig and Makefile changes
  RDS merge for UEK2
  rds: Misc Async Send fixes
  rds: call unregister_netdevice_notifier for rds_ib_nb in rds_ib_exit
  rds: flush and destroy workqueue rds_aux_wq and fix creation order.
  rds : fix compilation warning
  rds: port the code to uek2
  rds: CQ balance
  rds: HAIP across HCAs
  rds: Misc HAIP fixes
  rds: off by one fixes
  rds: Add Automatic Path Migration support
  rds: fix error flow handling
  net/rds: prevent memory leak in case of error flow
  rds: prepare support to kernel 2.6.39-200.1.1.el5uek: add the macro NIPQUAD_*
  ...
---

228d2d53b4e165aae0977204e60d79bb924ca197