Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7259f645 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 467590e0 c9160b69

drivers/ntb/hw/idt/ntb_hw_idt.c

+1 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ static int idt_ntb_peer_mw_clear_trans(struct ntb_dev *ntb, int pidx, 
 *                          5. Doorbell operations

 *

 *    Doorbell functionality of IDT PCIe-switches is pretty unusual. First of

 * all there is global doorbell register which state can by changed by any

 * all there is global doorbell register which state can be changed by any

 * NT-function of the IDT device in accordance with global permissions. These

 * permissions configs are not supported by NTB API, so it must be done by

 * either BIOS or EEPROM settings. In the same way the state of the global

drivers/ntb/hw/intel/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NTB_INTEL) += ntb_hw_intel.o

ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o