From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2016 18:37:42 +0000 (-0700)
Subject: Merge tag 'ntb-4.6' of git://github.com/jonmason/ntb
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4cec5f66849872d2e9573bc95c2016cb8e530ec;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'ntb-4.6' of git://github.com/jonmason/ntb

Pull NTB bug fixes from Jon Mason:
 "NTB bug fixes for tasklet from spinning forever, link errors,
  translation window setup, NULL ptr dereference, and ntb-perf errors.

  Also, a modification to the driver API that makes _addr functions
  optional"

* tag 'ntb-4.6' of git://github.com/jonmason/ntb:
  NTB: Remove _addr functions from ntb_hw_amd
  NTB: Make _addr functions optional in the API
  NTB: Fix incorrect clean up routine in ntb_perf
  NTB: Fix incorrect return check in ntb_perf
  ntb: fix possible NULL dereference
  ntb: add missing setup of translation window
  ntb: stop link work when we do not have memory
  ntb: stop tasklet from spinning forever during shutdown.
  ntb: perf test: fix address space confusion
---

b4cec5f66849872d2e9573bc95c2016cb8e530ec