diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-04 05:12:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-04 05:12:57 +0100 |
| commit | dc6d6844111d953d3fa2121da28d38be9359c911 (patch) | |
| tree | b09f7d9d3d0b09e338be3a459b7163ba7ed4a53a /kernel/time | |
| parent | Merge tag 'md/3.19-fixes' of git://neil.brown.name/md (diff) | |
| parent | Merge branches 'ipoib' and 'odp' into for-next (diff) | |
| download | linux-dc6d6844111d953d3fa2121da28d38be9359c911.tar.xz linux-dc6d6844111d953d3fa2121da28d38be9359c911.zip | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband reverts from Roland Dreier:
"Last minute InfiniBand/RDMA changes for 3.19:
- Revert IPoIB driver back to 3.18 state. We had a number of fixes
go into 3.19, but they introduced regressions. We tried to get
everything fixed up but ran out of time, so we'll try again for
3.20.
- Similarly, turn off the new "extended query port" verb. Late in
the cycle we realized the ABI is not quite right, and rather than
freeze something in a rush and make a mistake, we'll take a bit
more time and get it right in 3.20"
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/core: Temporarily disable ex_query_device uverb
Revert "IPoIB: Consolidate rtnl_lock tasks in workqueue"
Revert "IPoIB: Make the carrier_on_task race aware"
Revert "IPoIB: fix MCAST_FLAG_BUSY usage"
Revert "IPoIB: fix mcast_dev_flush/mcast_restart_task race"
Revert "IPoIB: change init sequence ordering"
Revert "IPoIB: Use dedicated workqueues per interface"
Revert "IPoIB: Make ipoib_mcast_stop_thread flush the workqueue"
Revert "IPoIB: No longer use flush as a parameter"
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions