lkml.org 
[lkml]   [2020]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the coresight tree with the char-misc tree
On Mon, Mar 23, 2020 at 04:20:18PM +1100, Stephen Rothwell wrote:
> 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.

That was the right thing to do. I will align my tree with Greg's in the coming
minutes.

Regards,
Mathieu

>
> --
> Cheers,
> Stephen Rothwell


\
 
 \ /
  Last update: 2020-03-23 17:23    [W:0.032 / U:3.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site