* linux-next: please clean up the coresight tree
@ 2018-08-01 5:45 Stephen Rothwell
2018-08-01 15:21 ` Mathieu Poirier
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-08-01 5:45 UTC (permalink / raw)
To: Mathieu Poirier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Greg KH,
Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Mathieu,
All but the last 9 commits in the coresight tree have been merged into
the char-misc tree as different commits (they were sent to Greg as a
patch series rather than a merge request). Can you please rebase your
tree into commit ccff2dfaceac ("coresight: tpiu: Fix disabling timeouts")
from the char-misc tree to avoid further conflicts (and duplication if
you ask Greg to merge your tree rather than take a patch series).
--
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: please clean up the coresight tree
2018-08-01 5:45 linux-next: please clean up the coresight tree Stephen Rothwell
@ 2018-08-01 15:21 ` Mathieu Poirier
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Poirier @ 2018-08-01 15:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Greg Kroah-Hartman, Arnd Bergmann
On Tue, 31 Jul 2018 at 23:45, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Mathieu,
>
> All but the last 9 commits in the coresight tree have been merged into
> the char-misc tree as different commits (they were sent to Greg as a
> patch series rather than a merge request). Can you please rebase your
> tree into commit ccff2dfaceac ("coresight: tpiu: Fix disabling timeouts")
> from the char-misc tree to avoid further conflicts (and duplication if
> you ask Greg to merge your tree rather than take a patch series).
>
Absolutely - right away.
Mathieu
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-01 15:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-01 5:45 linux-next: please clean up the coresight tree Stephen Rothwell
2018-08-01 15:21 ` 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).