LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nathan Chancellor <natechancellor@gmail.com>,
	Anders Roxell <anders.roxell@linaro.org>,
	maxime.ripard@bootlin.com, andre.przywara@arm.com,
	samuel@sholland.org,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for May 2
Date: Fri, 3 May 2019 02:43:44 +0200	[thread overview]
Message-ID: <991a8520-5bb9-a4cd-8dc0-38ac2f76571d@linaro.org> (raw)
In-Reply-To: <20190503080331.0ccc2419@canb.auug.org.au>

On 03/05/2019 00:03, Stephen Rothwell wrote:
> Hi Daniel,
> 
> On Thu, 2 May 2019 22:09:49 +0200 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>>
>> Yes, I picked the patch and it was merged it via the tip tree [1] as
>> requested by Marc Zyngier [2] and notified [3].
>>
>> In any case, this patch should have go through my tree initially, so if
>> it is found somewhere else that's wrong.
>>
>> I did a respin of my branch and pushed it again in case there was
>> something wrong from it.
> 
> The patch ("clocksource/drivers/arch_timer: Workaround for Allwinner
> A64 timer instability") was merged into v5.1-rc1 via the tip tree as
> you say, however the version of your clockevents tree in yesterday's
> linux-next was based on v5.0-rc1 and contained the patch again ...
> 
> Today's should be better.

Oh, ok. As I updated the branch today before having this merge conflict
I thought the problem was coming from somewhere else. Thanks for the update.



-- 
 <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


  reply	other threads:[~2019-05-03  0:43 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-02 10:10 Stephen Rothwell
2019-05-02 15:17 ` linux-next: Tree for May 2 (drivers/usb/mtu3/mtu3_debugfs.o) Randy Dunlap
2019-05-05  3:20   ` Chunfeng Yun
2019-05-02 19:00 ` linux-next: Tree for May 2 Anders Roxell
2019-05-02 19:08   ` Nathan Chancellor
2019-05-02 20:09     ` Daniel Lezcano
2019-05-02 22:03       ` Stephen Rothwell
2019-05-03  0:43         ` Daniel Lezcano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-02 11:45 Stephen Rothwell
2018-05-02  6:59 Stephen Rothwell
2017-05-02  6:47 Stephen Rothwell
2016-05-02  8:40 Stephen Rothwell
2014-05-02  7:17 Stephen Rothwell
2013-05-02  7:35 Stephen Rothwell
2012-05-22  8:30 Stephen Rothwell
2012-05-22 11:28 ` Stephen Rothwell
2011-05-02  5:01 Stephen Rothwell
2008-05-02 10:52 thomas

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=991a8520-5bb9-a4cd-8dc0-38ac2f76571d@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=anders.roxell@linaro.org \
    --cc=andre.przywara@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maxime.ripard@bootlin.com \
    --cc=natechancellor@gmail.com \
    --cc=samuel@sholland.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: Tree for May 2' \
    /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

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).