linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20200323162018.17d3091f@canb.auug.org.au>
Date:   Mon, 23 Mar 2020 16:20:18 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mathieu Poirier <mathieu.poirier@...aro.org>,
        Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     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: linux-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

Content of type "application/pgp-signature" skipped