Merge tag 'ntb-4.18' of git://github.com/jonmason/ntb
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jun 2018 20:14:30 +0000 (13:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jun 2018 20:14:30 +0000 (13:14 -0700)
commit7259f6452577f2df48f03d07e8302b8535cad74c
tree24d70385f3e275dfa8fe726aa13069da29e1faf0
parent467590e055f5c714fb457803250415879d0da9e5
parentc9160b69258ef46ab62c27a09decb8fef311e700
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