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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20200323162213.GA3291@xps15>
Date:   Mon, 23 Mar 2020 10:22:13 -0600
From:   Mathieu Poirier <mathieu.poirier@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mike Leach <mike.leach@...aro.org>,
        Suzuki K Poulose <suzuki.poulose@....com>,
        Nathan Chancellor <natechancellor@...il.com>
Subject: Re: 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