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> <70ee6a63-de17-100f-d4fd-8b23ab92bfee@linaro.org>
In-Reply-To: <70ee6a63-de17-100f-d4fd-8b23ab92bfee@linaro.org>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Tue, 29 Nov 2022 15:32:43 +0100
Message-ID: <CAMuHMdUc1xt+J6a-vfQ3uJiRYiU4Sda3XRjy89RqKSAv_zQBKQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
To:     Daniel Lezcano <daniel.lezcano@linaro.org>
Cc:     Bagas Sanjaya <bagasdotme@gmail.com>,
        "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

Hi Daniel,

On Mon, Nov 28, 2022 at 3:08 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 28/11/2022 14:48, Bagas Sanjaya wrote:
> > On Mon, Nov 28, 2022 at 02:22:27PM +0100, Daniel Lezcano wrote:
> >> 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.
>
> Thanks for the pointer.
>
> I've been quickly through the changes for the thermal tree and I think I
> should be able to sort out most of the patches before the end of this
> week, hopefully. If there are any changes which sound too complex, I'll
> post pone them to the next release

I gave it a try for today's renesas-drivers release.
Does the conflict] resolution in [1] look good to you?

Thanks!

[1] https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?h=renesas-drivers-2022-11-29-v6.1-rc7&id=9b249c2e655ef25473afbcdae85453c66eb288be

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds