lkml.org 
[lkml]   [2020]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the coresight tree with the char-misc tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-03-23 06:21    [W:0.053 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site