LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@kernel.org>
To: Andy Shevchenko <andy.shevchenko@gmail.com>,
	Hans de Goede <hdegoede@redhat.com>
Cc: Darren Hart <dvhart@infradead.org>,
	Andy Shevchenko <andy@infradead.org>,
	Kai Heng Feng <kai.heng.feng@canonical.com>,
	Platform Driver <platform-driver-x86@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Semyon Verchenko <semverchenko@factor-ts.ru>
Subject: Re: [PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table
Date: Tue, 07 May 2019 13:17:50 -0700	[thread overview]
Message-ID: <155726027056.14659.1724431433952718602@swboyd.mtv.corp.google.com> (raw)
In-Reply-To: <568ba27d-a6a5-b158-bab1-f22cd8ccb34e@redhat.com>

Quoting Hans de Goede (2019-05-06 08:05:42)
> Hi,
> 
> On 06-05-19 16:59, Andy Shevchenko wrote:
> > On Mon, May 6, 2019 at 5:47 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >>
> >> Hi,
> >>
> >> On 06-05-19 14:38, Andy Shevchenko wrote:
> >>> On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >>>>
> >>>> The Lex 3I380D industrial PC has 4 ethernet controllers on board
> >>>> which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems
> >>>> DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks
> >>>> as CLK_CRITICAL and they will not get turned off.
> >>>>
> >>>
> >>> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> >>> supposedly to go via CLK tree.
> >>>
> >>> P.S. If you want it through PDx86, I need immutable branch / tag from CLK.
> >>
> >> Stephen added the patches this depends on to his fixes branch, so they
> >> are in the 5.1 / Torvald's master branch, since we are now in the 5.2 merge
> >> window, you should be able to cleanly apply this directly.
> > 
> > We don't do back merges, so, our base is v5.1-rc1. Does it mean the
> > commit in question is in v5.1-rc1?
> > AFAICS it was appeared in v5.1-rc5.
> 
> Ah, I see, my bad.
> 
> Stephen can you pick up this patch and the
> "[PATCH 1/1] Add several Beckhoff Automation boards to critclk_systems DMI table"
> patch then?
> 

I guess this is urgent? I'm lost why Andy can't apply the patch and
merge it up to Linus. I don't maintain this driver here, and even if
there's a cross tree dependency I don't understand why a base of
v5.1-rc1 is limiting abilities to apply patches.

I'd think that if an "immutable branch" was all that was required you
could 'git checkout 7c2e07130090ae001a97a6b65597830d6815e93e' and then
apply the patch there and merge it all up into the PDx86 tree. In the
end, when sending the PR to Linus the already merged changes won't show
up in the diff because it's all been merged already on the other side.

Either way, I'm going to send off the clk PR real soon so this may need
to wait until after the merge window, or if it's really urgent I could
send a fixes branch before the merge window closes next week.


  reply	other threads:[~2019-05-07 20:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-29 15:01 Hans de Goede
2019-05-06 12:38 ` Andy Shevchenko
2019-05-06 14:47   ` Hans de Goede
2019-05-06 14:59     ` Andy Shevchenko
2019-05-06 15:05       ` Hans de Goede
2019-05-07 20:17         ` Stephen Boyd [this message]
2019-05-08  7:48           ` Hans de Goede
2019-05-08  8:42             ` Andy Shevchenko
2019-05-08  9:20               ` Hans de Goede
2019-05-08 22:55                 ` Darren Hart
2019-05-08 23:23                   ` Darren Hart
2019-05-22 12:32               ` Hans de Goede
2019-05-24 16:50                 ` Andy Shevchenko

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=155726027056.14659.1724431433952718602@swboyd.mtv.corp.google.com \
    --to=sboyd@kernel.org \
    --cc=andy.shevchenko@gmail.com \
    --cc=andy@infradead.org \
    --cc=dvhart@infradead.org \
    --cc=hdegoede@redhat.com \
    --cc=kai.heng.feng@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=semverchenko@factor-ts.ru \
    --subject='Re: [PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table' \
    /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).