LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Darren Hart <dvhart@infradead.org>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
	Stephen Boyd <sboyd@kernel.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: Wed, 8 May 2019 16:23:56 -0700	[thread overview]
Message-ID: <20190508232356.GA33357@wrath> (raw)
In-Reply-To: <20190508225522.GA32286@wrath>

On Wed, May 08, 2019 at 03:55:22PM -0700, Darren Hart wrote:
> On Wed, May 08, 2019 at 11:20:52AM +0200, Hans de Goede wrote:
> > Hi,
> > 
> > On 08-05-19 10:42, Andy Shevchenko wrote:
> > > On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
> > > > On 07-05-19 22:17, Stephen Boyd wrote:
> > > > > Quoting Hans de Goede (2019-05-06 08:05:42)
> > > 
> > > > > I guess this is urgent?
> > > > 
> > > > Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3
> > > > would be bad.
> > > 
> > > So, I can do it as a fixes for rc2, just ping me after merge window.
> > 
> > Ok, will do.
> 
> Andy, what is the issue here? If the dependency is in v5.1 we can do a "merge
> --ff-only v5.1" in our for-next branch in order to pull it in, that would be the
> same as an immutable branch basically.
> 

A simpler solution for this case would be to issue two PRs to Linus from two
different branches. Other subsystems send topic branches, so this isn't out of
the ordinary.

I have merged the two patches in question from Hans and Steffen to for-next-2.

We could send two PRs back to back, with a note to Linus why this is a bit
different than usual, and then come back together in our for-next and fixes
branches once both are merged and continue as usual.

Any concerns with this approach?

-- 
Darren Hart
VMware Open Source Technology Center

  reply	other threads:[~2019-05-08 23:24 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
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 [this message]
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=20190508232356.GA33357@wrath \
    --to=dvhart@infradead.org \
    --cc=andy.shevchenko@gmail.com \
    --cc=andy@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=sboyd@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).