OpenCloudOS-Kernel/drivers/infiniband/hw/qib
Doug Ledford 894b82c427 Merge branch 'timer_setup' into for-next
Conflicts:
	drivers/infiniband/hw/cxgb4/cm.c
	drivers/infiniband/hw/qib/qib_driver.c
	drivers/infiniband/hw/qib/qib_mad.c

There were minor fixups needed in these files.  Just minor context diffs
due to patches from independent sources touching the same basic area.

Signed-off-by: Doug Ledford <dledford@redhat.com>
2017-10-18 13:12:09 -04:00
..
Kconfig IB: Move PCI dependency from root KConfig to HW's KConfigs 2017-09-27 08:54:19 -04:00
Makefile IB/qib: Remove srq functionality 2016-03-10 20:37:33 -05:00
qib.h Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_6120_regs.h
qib_7220.h Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_7220_regs.h
qib_7322_regs.h IB/qib: Mask hardware error during link reset 2010-07-06 14:13:20 -07:00
qib_common.h IB/hfi1, qib, rdmavt: Move AETH credit functions into rdmavt 2017-02-19 09:18:38 -05:00
qib_debugfs.c IB/qib: Convert qp_stats debugfs interface to use new iterator API 2017-08-28 19:12:30 -04:00
qib_debugfs.h IB/qib: Convert opcode counters to per-context 2013-06-21 17:19:50 -07:00
qib_diag.c IB/qib: Remove set-but-not-used variables 2017-10-14 20:47:07 -04:00
qib_driver.c IB/qib: Convert timers to use timer_setup() 2017-10-09 12:19:41 -04:00
qib_eeprom.c IB/qib: Remove debug prints after allocation failure 2016-12-03 13:12:52 -05:00
qib_file_ops.c IB/qib: Remove set-but-not-used variables 2017-10-14 20:47:07 -04:00
qib_fs.c fs: constify tree_descr arrays passed to simple_fill_super() 2017-04-26 23:54:06 -04:00
qib_iba6120.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_iba7220.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_iba7322.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_init.c IB/qib: Convert timers to use timer_setup() 2017-10-09 12:19:41 -04:00
qib_intr.c IB/qib: Convert timers to use timer_setup() 2017-10-09 12:19:41 -04:00
qib_keys.c IB/qib: Remove DMA mapping code 2017-01-24 12:23:35 -05:00
qib_mad.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_mad.h IB/core: Add core header changes needed for OPA 2015-08-28 22:54:50 -04:00
qib_pcie.c IB/qib: Remove set-but-not-used variables 2017-10-14 20:47:07 -04:00
qib_pio_copy.c
qib_qp.c IB/qib: Convert qp_stats debugfs interface to use new iterator API 2017-08-28 19:12:30 -04:00
qib_qsfp.c IB/qib: Remove empty function 2017-01-24 16:20:37 -05:00
qib_qsfp.h IB/qib: Remove empty function 2017-01-24 16:20:37 -05:00
qib_rc.c IB/qib: Suppress gcc 7 fall-through complaints 2017-10-14 20:47:07 -04:00
qib_ruc.c IB/qib: Stricter bounds checking for copy and array access 2017-08-28 19:12:17 -04:00
qib_sd7220.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_sdma.c IB/qib: Suppress gcc 7 fall-through complaints 2017-10-14 20:47:07 -04:00
qib_sysfs.c IB/qib: add const to bin_attribute structures 2017-08-18 14:06:09 -04:00
qib_twsi.c IB/qib: Add blank line after declaration 2015-02-20 09:04:12 -08:00
qib_tx.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_uc.c IB/core: Use rdma_ah_attr accessor functions 2017-05-01 14:32:43 -04:00
qib_ud.c IB/hfi1,qib: Do not send QKey trap for UD qps 2017-06-27 16:58:12 -04:00
qib_user_pages.c sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h> 2017-03-02 08:42:29 +01:00
qib_user_sdma.c RDMA/qib: use rb_entry() 2017-01-12 11:38:41 -05:00
qib_user_sdma.h
qib_verbs.c Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
qib_verbs.h IB/qib: Convert qp_stats debugfs interface to use new iterator API 2017-08-28 19:12:30 -04:00
qib_wc_ppc64.c
qib_wc_x86_64.c IB/qib: fix test of unsigned variable 2015-05-12 13:55:41 -04:00