From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Jun 2017 02:57:06 +0000 (+0800)
Subject: Merge tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntb
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=865be78022e9ae8151c755d01201012ccf5e3232;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Pull NTB fixes from Jon Mason:
 "NTB bug fixes to address the modinfo in ntb_perf, a couple of bugs in
  the NTB transport QP calculations, skx doorbells, and sleeping in
  ntb_async_tx_submit"

* tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntb:
  ntb: no sleep in ntb_async_tx_submit
  ntb: ntb_hw_intel: Skylake doorbells should be 32bits, not 64bits
  ntb_transport: fix bug calculating num_qps_mw
  ntb_transport: fix qp count bug
  NTB: ntb_test: fix bug printing ntb_perf results
  ntb: Correct modinfo usage statement for ntb_perf
---

865be78022e9ae8151c755d01201012ccf5e3232