Michael Ellerman f1079d3a3d Merge branch 'fixes' into next ...

We ended up with an ugly conflict between fixes and next in ftrace.h
involving multiple nested ifdefs, and the automatic resolution is
wrong. So merge fixes into next so we can fix it up.

2018-06-03 20:32:02 +10:00

..

api.c

the rest of drivers/*: annotate ->poll() instances

2017-11-28 11:06:58 -05:00

base.c

cxl: Add support for interrupts on the Mellanox CX4

2016-07-14 20:27:08 +10:00

context.c

cxl: Add support for ASB_Notify on POWER9

2018-01-19 23:19:37 +11:00

cxl.h

cxl: Report the tunneled operations status

2018-05-15 21:30:01 +10:00

cxllib.c

cxl: Fix possible deadlock when processing page faults from cxllib

2018-04-04 22:09:33 +10:00

debugfs.c

cxl: Rework the implementation of cxl_stop_trace_psl9()

2017-11-06 16:48:17 +11:00

fault.c

cxl: Add support for POWER9 DD2

2017-10-06 20:52:43 +11:00

file.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

flash.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

guest.c

cxl: Add psl9 specific code

2017-04-13 23:34:31 +10:00

hcalls.c

cxl: Remove unused values in bare-metal environment.

2017-04-13 23:34:28 +10:00

hcalls.h

cxl: Add guest-specific code

2016-03-09 23:36:52 +11:00

irq.c

cxl: Add psl9 specific code

2017-04-13 23:34:31 +10:00

Kconfig

cxl: Export library to support IBM XSL

2017-07-03 23:07:03 +10:00

main.c

cxl: Fixes for Coherent Accelerator Interface Architecture 2.0

2017-06-23 16:26:23 +10:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

native.c

cxl: Check if PSL data-cache is available before issue flush request

2018-03-13 15:50:26 +11:00

of.c

cxl: replace loop with for_each_child_of_node(), remove unneeded of_node_put()

2016-10-04 16:19:23 +11:00

pci.c

Merge branch 'fixes' into next

2018-06-03 20:32:02 +10:00

phb.c

cxl: Fix error handling in _cxl_pci_associate_default_context()

2016-11-18 22:41:08 +11:00

sysfs.c

Merge branch 'fixes' into next

2018-06-03 20:32:02 +10:00

trace.c

cxl: Add tracepoints

2015-01-22 17:31:51 +11:00

trace.h

cxl: Add psl9 specific code

2017-04-13 23:34:31 +10:00

vphb.c

powerpc: rename dma_direct_ to dma_nommu_

2018-01-10 16:41:14 +01:00