linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Zhang Rui <rui.zhang@intel.com>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Guenter Roeck <linux@roeck-us.net>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	rafael@kernel.org
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Date: Mon, 28 Nov 2022 14:54:05 +0100	[thread overview]
Message-ID: <CAJZ5v0gL35QJXECJGnSwPbC3RFWoAD=KGpPdJ0YA1VAPtP1A+Q@mail.gmail.com> (raw)
In-Reply-To: <Y4S8H/hn1EJzw8fL@debian.me>

On Mon, Nov 28, 2022 at 2:48 PM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> On Mon, Nov 28, 2022 at 02:22:27PM +0100, Daniel Lezcano wrote:
> >
> > Hi,
> >
> > On 28/11/2022 13:51, Rafael J. Wysocki wrote:
> > > Sorry about this, but I cannot fix it myself and Daniel is on an
> > > extended leave.
> > >
> > > Can you just drop it permanently from linux-next and we'll sort this out
> > > when Daniel is back?
> >
> > Yes sorry for that, I'll go back in a couple of days and sort this out
> >
>
> What about the upcoming merge window? At worst Linus has to figure
> out how to solve this complex conflict when pulling either tree...
>
> Linus has already said that there's likely -rc8 of current cycle [1],
> so we have about two weeks to try sorting out the conflict and be ready
> for PR to him.

As I said before, the thermal tree is merged through the PM tree
anyway, so it needs to be addressed in the thermal tree or worked
around somehow.  Linus will not see this conflict.

Worst-case I can apply patches directly with an ACK from Daniel.

Thanks!

  reply	other threads:[~2022-11-28 13:54 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-17  1:29 linux-next: manual merge of the thermal tree with the pm tree Stephen Rothwell
2022-11-17 16:18 ` Rafael J. Wysocki
2022-11-27 23:22 ` Stephen Rothwell
2022-11-28 12:51   ` Rafael J. Wysocki
2022-11-28 13:22     ` Daniel Lezcano
2022-11-28 13:48       ` Bagas Sanjaya
2022-11-28 13:54         ` Rafael J. Wysocki [this message]
2022-11-28 13:56         ` Daniel Lezcano
2022-11-29 14:32           ` Geert Uytterhoeven
  -- strict thread matches above, loose matches on Subject: below --
2024-01-01 23:09 Stephen Rothwell
2023-04-06  0:32 Stephen Rothwell
2023-01-24 22:45 Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J
2023-01-24 22:39 Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J
2023-01-04 23:10 Stephen Rothwell
2023-01-04 23:35 ` Stephen Rothwell
2023-01-05 14:27   ` Wysocki, Rafael J
2023-01-05 15:30     ` Daniel Lezcano
2023-01-05 20:13       ` Wysocki, Rafael J
2023-01-04 23:03 Stephen Rothwell
2014-10-10  1:10 Stephen Rothwell
2014-10-10  8:40 ` Zhang Rui
2014-01-06  3:14 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='CAJZ5v0gL35QJXECJGnSwPbC3RFWoAD=KGpPdJ0YA1VAPtP1A+Q@mail.gmail.com' \
    --to=rafael@kernel.org \
    --cc=bagasdotme@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=rafael.j.wysocki@intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=rui.zhang@intel.com \
    --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).