git.osdn.net Git - android-x86/kernel.git/commit

(root) / android-x86 / kernel.git / commit

author	Doug Ledford <dledford@redhat.com>
	Wed, 18 Oct 2017 17:12:09 +0000 (13:12 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Wed, 18 Oct 2017 17:12:09 +0000 (13:12 -0400)
commit	894b82c427d069a773e1d1417fe30bd31aa18801
tree	8b361de9085f7891b4a673064b55f34b17bccb1e	tree \| snapshot
parent	754137a769ac8f13cd6c0e1bc4fc2fa768d3da63	commit \| diff
parent	a9346abed52f08e3e0ceb66d51f527ea11698d3c	commit \| diff

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>

29 files changed:

drivers/infiniband/hw/cxgb3/iwch_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/init.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/mad.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/i40iw/i40iw_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/i40iw/i40iw_utils.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_utils.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_7220.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba6120.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba7220.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba7322.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_mad.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_sd7220.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_ib.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history

kernel

RSS Atom

About OSDN

Find Software

Develop Software

Help

drivers/infiniband/hw/cxgb3/iwch_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/iw_cxgb4.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/cxgb4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/init.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/mad.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/i40iw/i40iw_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/i40iw/i40iw_utils.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_utils.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_7220.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba6120.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba7220.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_iba7322.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_mad.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_sd7220.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_ib.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history