Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20221117122904.6759427e@canb.auug.org.au> <20221128102212.39f90b0c@canb.auug.org.au>
 <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com> <9ac3a182-fc30-0834-8555-a4ec334531ae@linaro.org>
 <Y4S8H/hn1EJzw8fL@debian.me>
In-Reply-To: <Y4S8H/hn1EJzw8fL@debian.me>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Mon, 28 Nov 2022 14:54:05 +0100
Message-ID: <CAJZ5v0gL35QJXECJGnSwPbC3RFWoAD=KGpPdJ0YA1VAPtP1A+Q@mail.gmail.com>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
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
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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!