From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: please clean up the clockevents tree
Date: Thu, 20 Dec 2018 09:47:53 +0100 [thread overview]
Message-ID: <bcd7f298-c223-0d40-dbf5-edc8e1650794@linaro.org> (raw)
In-Reply-To: <20181220161504.5720655d@canb.auug.org.au>
On 20/12/2018 06:15, Stephen Rothwell wrote:
> Hi Daniel,
>
> It looks like all the changes in the clockevents tree appear as other
> commits in other tree(s). Could you please reset your tree to somewhere
> in your upstream tree as it is beginning to produce conflicts.
Done.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2018-12-20 8:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 5:15 linux-next: please clean up the clockevents tree Stephen Rothwell
2018-12-20 8:47 ` Daniel Lezcano [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-21 0:37 Stephen Rothwell
2020-02-21 8:32 ` Daniel Lezcano
2020-02-21 11:11 ` Stephen Rothwell
2018-03-13 23:02 Stephen Rothwell
[not found] ` <ce514c90-f9ec-fc9e-e205-cd822cd766b2@linaro.org>
2018-03-14 8:01 ` Stephen Rothwell
2017-07-10 3:30 Stephen Rothwell
2017-07-10 10:36 ` Daniel Lezcano
2017-07-10 10:55 ` Stephen Rothwell
2015-05-13 5:19 Stephen Rothwell
2015-05-13 7:46 ` Daniel Lezcano
2015-05-13 8:26 ` Stephen Rothwell
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=bcd7f298-c223-0d40-dbf5-edc8e1650794@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).