From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EC37C43217 for ; Mon, 28 Nov 2022 13:54:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbiK1NyV (ORCPT ); Mon, 28 Nov 2022 08:54:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232209AbiK1NyT (ORCPT ); Mon, 28 Nov 2022 08:54:19 -0500 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E73DBD66; Mon, 28 Nov 2022 05:54:17 -0800 (PST) Received: by mail-qk1-f178.google.com with SMTP id k2so7200929qkk.7; Mon, 28 Nov 2022 05:54:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mhpwzb170HD9ZoLWi4u/Hbo7xH+NenOLfdRLL8Ga/W4=; b=zLK535hSHtzFHMUW15p0jqZXj0yv+BWwR1bIXuRTcS4cnW43o/3zqaGmaiXfw/XH7h 5g8lmKLDac3P84miZ6Ga7U0B1H7jdjLbq0IY/6tBxStm/PTuP6z1+s64C9NMcdK0rETu uzIEjepGMMdYZzo4TSIfXcv8YdQL1OfwUm3i0vTqbLefLtj6KS3n6/bbHN0fo/Jgbw68 D6Mub7GsEzYV+SYOXCoZqVtCWaELkUxjNEX7CZERKxpANA0DjlboLtcc9Eks724gs7RJ v7Y7Nkke4qxTDiydGkV4BvV4yPeJvJ+iA/hfNTdACoXn0ksWBjpCqXlAmhPbd0M2ldeE EIUQ== X-Gm-Message-State: ANoB5pkKOQe4v3D15X0ic26UpIUjKO7qXbvREseYRcx9rwzAqlHSUGCV EmHcdxFw2YCeumEhC2S3d6dybG/HuuZrnX3x6sA= X-Google-Smtp-Source: AA0mqf5BP1RwSK8wuyMUkYiuewje17S+ol5TdCh/rsMAdpCSCB/moLDi2JIks2Yfmz/l6v2DjSBNlWF8ZpbrOdztEBQ= X-Received: by 2002:a05:620a:51ca:b0:6ec:fa04:d97c with SMTP id cx10-20020a05620a51ca00b006ecfa04d97cmr29006601qkb.764.1669643657059; Mon, 28 Nov 2022 05:54:17 -0800 (PST) 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> In-Reply-To: From: "Rafael J. Wysocki" Date: Mon, 28 Nov 2022 14:54:05 +0100 Message-ID: Subject: Re: linux-next: manual merge of the thermal tree with the pm tree To: Bagas Sanjaya Cc: Daniel Lezcano , "Rafael J. Wysocki" , Stephen Rothwell , Zhang Rui , "Rafael J. Wysocki" , Guenter Roeck , Linux Kernel Mailing List , Linux Next Mailing List , rafael@kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Nov 28, 2022 at 2:48 PM Bagas Sanjaya 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!