linux-next: manual merge of the coresight tree with the char-misc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the coresight tree got conflicts in:

  Documentation/ABI/testing/sysfs-bus-coresight-devices-cti
  Documentation/trace/coresight/coresight-ect.rst
  drivers/hwtracing/coresight/coresight-cti-sysfs.c
  drivers/hwtracing/coresight/coresight-cti.c
  drivers/hwtracing/coresight/coresight-priv.h
  drivers/hwtracing/coresight/coresight.c
  include/linux/coresight.h

There are a series of commits in both the char-misc tree and the coresight
tree that have the same subjects but are slightly different patches.
Since the coresight tree is merged via the char-misc tree (and that tree's
commits are more recent), I have dropped the coresoght tree for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgphixe5_WUIh.pgp
Description: OpenPGP digital signature