From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mike Leach <mike.leach@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Nathan Chancellor <natechancellor@gmail.com>
Subject: linux-next: manual merge of the coresight tree with the char-misc tree
Date: Mon, 23 Mar 2020 16:20:18 +1100 [thread overview]
Message-ID: <20200323162018.17d3091f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-23 5:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 5:20 Stephen Rothwell [this message]
2020-03-23 16:22 ` linux-next: manual merge of the coresight tree with the char-misc tree Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200323162018.17d3091f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=natechancellor@gmail.com \
--cc=suzuki.poulose@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).