diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 19:52:19 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 19:52:19 +0200 |
commit | dcbcb49155be1934d13887e50b9b728e153b15c3 (patch) | |
tree | 78a472f4d5d76d3f10a90aa6598350ed2e2d8821 /net/rds/ib_cm.c | |
parent | Merge tag 'nfsd-4.11-1' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | ARC: fix build warnings with !CONFIG_KPROBES (diff) | |
download | linux-dcbcb49155be1934d13887e50b9b728e153b15c3.tar.xz linux-dcbcb49155be1934d13887e50b9b728e153b15c3.zip |
Merge tag 'arc-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
"Accumulated fixes for ARC which I've been been sitting on for a while:
- reading clk from driver vs device tree [Vlad]
- fix support for UIO in VDK platform [Alexey]
- SLC busy bit reading workaround
- build warning with kprobes header reorg"
* tag 'arc-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: fix build warnings with !CONFIG_KPROBES
ARCv2: SLC: Make sure busy bit is set properly on SLC flushing
ARC: vdk: Fix support of UIO
ARCv2: make unimplemented vectors as no-ops rather than halt core
ARC: get rate from clk driver instead of reading device tree
ARC: [dts] add cpu nodes to ARCHS SMP device tree
ARC: [dts] add input clocks for cpu nodes
Diffstat (limited to 'net/rds/ib_cm.c')
0 files changed, 0 insertions, 0 deletions