* linux-next: manual merge of the coresight tree with the char-misc tree
@ 2020-03-23 5:20 Stephen Rothwell
2020-03-23 16:22 ` Mathieu Poirier
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-23 5:20 UTC (permalink / raw)
To: Mathieu Poirier, Greg KH, Arnd Bergmann
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Mike Leach,
Suzuki K Poulose, Nathan Chancellor
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the coresight tree with the char-misc tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Poirier @ 2020-03-23 16:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Arnd Bergmann, Linux Next Mailing List,
Linux Kernel Mailing List, Mike Leach, Suzuki K Poulose,
Nathan Chancellor
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-23 16:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).