diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 23:14:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 23:14:30 +0300 |
| commit | 7259f6452577f2df48f03d07e8302b8535cad74c (patch) | |
| tree | 24d70385f3e275dfa8fe726aa13069da29e1faf0 /drivers/ntb/hw/idt/ntb_hw_idt.c | |
| parent | 467590e055f5c714fb457803250415879d0da9e5 (diff) | |
| parent | c9160b69258ef46ab62c27a09decb8fef311e700 (diff) | |
| download | linux-7259f6452577f2df48f03d07e8302b8535cad74c.tar.xz | |
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
Diffstat (limited to 'drivers/ntb/hw/idt/ntb_hw_idt.c')
| -rw-r--r-- | drivers/ntb/hw/idt/ntb_hw_idt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c index 8d98872d0983..dbe72f116017 100644 --- a/drivers/ntb/hw/idt/ntb_hw_idt.c +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c @@ -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 |