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 0BE67C761AF for ; Wed, 5 Apr 2023 19:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234021AbjDETDo (ORCPT ); Wed, 5 Apr 2023 15:03:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233074AbjDETDl (ORCPT ); Wed, 5 Apr 2023 15:03:41 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F4A6E88 for ; Wed, 5 Apr 2023 12:03:39 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id s13so21454761wmr.4 for ; Wed, 05 Apr 2023 12:03:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680721418; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Gmucir5jyM4jMHrONrMhWbS5Zw1yHw/RNM5pJeUcriQ=; b=XZbc2YhHoxJWcvIWYgoom1znxFSN4xi8BaxZ7VJ8am+/YXSfN16Eg6gEYhCKpEGX/R GpN+Z2bWqEBrK2X/g7LDSMcWHEk/O5NGLuGfGBlgmQwH4ZgzcnvmPKbQsjbM6fedbdmp Nel3IPB2Z1PSCTmCVlopSuPHDGFMAB+A9B7CwoHLVRaCde0zDZXSHWvKig3rxwgzGbhW D7LBYjrayFxd+HMp3dfAt7yoctVrbVe16fl/AlT6x3g4stY+Kc/JLHm8hRAxLThIRh6i KmSCNV8w8EI6Qh9su3vmifFMyqwAAs6cSMt8vLp5BNvdjAeh1ClQ4ZM8TGEnSChA1KZi kxPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680721418; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Gmucir5jyM4jMHrONrMhWbS5Zw1yHw/RNM5pJeUcriQ=; b=orsaE5knBVCuOyiNEXLisRa9zPg0z7MVDkx7ad3/FB/iOOl/eST8f2OQKum2yHaDjF F1sf3eIwHvnM4wLlWDokc1Q1sApYAwy7QEoRVMQFv2bNdJv/0KJzbhLokGyDQXJUHC4A pUvGej/doJxjX/5LcgpGpxbLomu7yTZV8ppl6AbKZNfph67XZulaD/eL/tWNOaKxSACc Mlf+4EmQCdjfJiy/V9kkkCbXGmk0n2XLqv26q0UlvA74FerVVSvNdmMhc1dGBFsS21Ds xLGq8oBdXcdb3JUy6bqgWurLcemwNLbh0MXzAKdR6pd7Xe5yaBdyvyWRSRR0BzDkA9VR fDWg== X-Gm-Message-State: AAQBX9d89jQuj/hdu4nl3pz70l/i1jgl//hdLstfzr65Gka1W7nXam3U JfrlyrVULskWMvv1VlBF0fRJ6A== X-Google-Smtp-Source: AKy350YpNGKeRKZP33gK9YmIL4mDmK+sRs8CyQw7mRzx2tHZ2G1FIcnA6cA++5fQtxzasIGUUFOhhQ== X-Received: by 2002:a7b:c419:0:b0:3f0:3a43:aa70 with SMTP id k25-20020a7bc419000000b003f03a43aa70mr5251617wmi.24.1680721417541; Wed, 05 Apr 2023 12:03:37 -0700 (PDT) Received: from ?IPV6:2a05:6e02:1041:c10:6630:ee96:3710:24c8? ([2a05:6e02:1041:c10:6630:ee96:3710:24c8]) by smtp.googlemail.com with ESMTPSA id t16-20020a05600c451000b003ef66c89af0sm6425837wmo.0.2023.04.05.12.03.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Apr 2023 12:03:37 -0700 (PDT) Message-ID: Date: Wed, 5 Apr 2023 21:03:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [GIT PULL] thermal for v6.4-rc1 Content-Language: en-US To: "Rafael J. Wysocki" Cc: "Rafael J. Wysocki" , Zhang Rui , Linux Kernel Mailing List , Linux PM mailing list , Amjad Ouled-Ameur , Fabien Parent , Markus Schneider-Pargmann , Wolfram Sang , Yang Li References: <3e64e6b2-7c3f-d149-2f7d-6c41be4c4d14@linaro.org> From: Daniel Lezcano In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/04/2023 20:48, Rafael J. Wysocki wrote: > On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki wrote: >> >> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano wrote: >>> >>> >>> Hi Rafael, >>> >>> just a gentle reminder >> >> This is in my linux-next branch, I'll merge it into thermal tomorrow. >> >>> because more material will come in the next days >> >> So why can't it wait? > > BTW, I get a merge conflict in > drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge > thermal/linux-next into my linux-next branch. Ah? I did an update and rebased thermal/linux-next on top of linux-pm/thermal without conflict Is it possible you have a change in a different branch conflicting with it ? -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog