diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:32:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:32:02 +1000 |
| commit | f1079d3a3d1f468f8faa3f506c163d44fac01912 (patch) | |
| tree | 51932f197a50dde3d8623752cca73cdd82a4553e /drivers/misc/cxl/cxl.h | |
| parent | b5240b14396dd9c781b5c759830560cdcf1b7a10 (diff) | |
| parent | faf37c44a105f3608115785f17cbbf3500f8bc71 (diff) | |
| download | blackbird-op-linux-f1079d3a3d1f468f8faa3f506c163d44fac01912.tar.gz blackbird-op-linux-f1079d3a3d1f468f8faa3f506c163d44fac01912.zip | |
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.
Diffstat (limited to 'drivers/misc/cxl/cxl.h')
| -rw-r--r-- | drivers/misc/cxl/cxl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h index a4c9c8297a6d..918d4fb742d1 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h @@ -717,6 +717,7 @@ struct cxl { bool perst_select_user; bool perst_same_image; bool psl_timebase_synced; + bool tunneled_ops_supported; /* * number of contexts mapped on to this card. Possible values are: |
