From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jun 2018 20:14:30 +0000 (-0700)
Subject: Merge tag 'ntb-4.18' of git://github.com/jonmason/ntb
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7259f6452577f2df48f03d07e8302b8535cad74c;p=openwrt%2Fstaging%2Fblogic.git

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

Pull NTB updates from Jon Mason:

 - reorg and clean-up of the Intel NTB driver

 - a trivial comment change

 - change GFP_ATOMIC to GFP_KERNEL where appropriate

* tag 'ntb-4.18' of git://github.com/jonmason/ntb:
  ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue
  ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_setup_qp_mw
  NTB: ntb_hw_idt: fix typo 'can by' to 'can be'
  ntb: intel: change references of skx to gen3
  ntb: intel: split out the gen3 code
  ntb: intel: header definitions refactor
---

7259f6452577f2df48f03d07e8302b8535cad74c