summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-25 00:48:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-25 00:48:38 +0200
commit90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (patch)
tree982ae0d6653b7a4b5020b52173cb989bd6e3aab0 /arch/x86/include/asm/io.h
parentMerge tag 'acpi-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
parentIB/mlx5: Always return success for RoCE modify port (diff)
downloadlinux-90a6cd503982bfd33ce8c70eb49bd2dd33bc6325.tar.xz
linux-90a6cd503982bfd33ce8c70eb49bd2dd33bc6325.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma fixes from Doug Ledford: "Well, I thought we were going to be done for this -rc cycle. I should have known better than to say so though. We have four additional items that trickled in. One was a simple mistake on my part. I took a patch into my for-next thinking that the issue was less severe than it was. I was then notified that it needed to be in my -rc area instead. The other three were just found late in testing. Summary: - One core fix accidentally applied first to for-next and then cherry picked back because it needed to be in the -rc cycles instead - Another core fix - Two mlx5 fixes" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: IB/mlx5: Always return success for RoCE modify port IB/mlx5: Fix Raw Packet QP event handler assignment IB/core: Avoid accessing non-allocated memory when inferring port type RDMA/uverbs: Initialize cq_context appropriately
Diffstat (limited to 'arch/x86/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions