From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
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: Re: linux-next: manual merge of the coresight tree with the char-misc tree
Date: Mon, 23 Mar 2020 10:22:13 -0600 [thread overview]
Message-ID: <20200323162213.GA3291@xps15> (raw)
In-Reply-To: <20200323162018.17d3091f@canb.auug.org.au>
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
prev parent reply other threads:[~2020-03-23 16:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 5:20 linux-next: manual merge of the coresight tree with the char-misc tree Stephen Rothwell
2020-03-23 16:22 ` Mathieu Poirier [this message]
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=20200323162213.GA3291@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mike.leach@linaro.org \
--cc=natechancellor@gmail.com \
--cc=sfr@canb.auug.org.au \
--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