All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org, linux-rtc@vger.kernel.org,
	rjw@rjwysocki.net, gabriele.mzt@gmail.com
Subject: Re: [PATCH 1/3] rtc: cmos: allow using ACPI for RTC alarm instead of HPET
Date: Tue, 24 Apr 2018 15:30:25 +0200	[thread overview]
Message-ID: <20180424133025.GC19011@piout.net> (raw)
In-Reply-To: <1524575720.2597.28.camel@intel.com>

On 24/04/2018 21:15:20+0800, Zhang Rui wrote:
> > > Yes, I noticed this conflict as well.
> > > I have rebased it on top of -rc1 and it is under testing right now.
> > > I will rebase on your tree and resend.
> > > 
> > Rebasing on top of -rc1 is sufficient, I'm already carrying your
> > patches
> > now so they are part of linux-next early in the cycle.
> > 
> Great, thanks.
> so I don't need to send the refreshed ones, right?
> 

If what I did works, then all is fine and I'll send them to Linus for
4.18.

-- 
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

      reply	other threads:[~2018-04-24 13:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-26 13:58 [PATCH 1/3] rtc: cmos: allow using ACPI for RTC alarm instead of HPET Zhang Rui
2018-03-26 13:58 ` [PATCH 2/3] rtc: cmos: acknowledge ACPI driven wake alarms upon resume Zhang Rui
2018-03-26 13:58 ` [PATCH 3/3] rtc: cmos: introduce quirks to enable use_acpi_alarm mode Zhang Rui
2018-04-19 14:05 ` [PATCH 1/3] rtc: cmos: allow using ACPI for RTC alarm instead of HPET Alexandre Belloni
2018-04-20  5:59   ` Zhang Rui
2018-04-20  6:46     ` Alexandre Belloni
2018-04-24 13:15       ` Zhang Rui
2018-04-24 13:30         ` Alexandre Belloni [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=20180424133025.GC19011@piout.net \
    --to=alexandre.belloni@free-electrons.com \
    --cc=gabriele.mzt@gmail.com \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-rtc@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=rui.zhang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.