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;
Message-ID: <8600edf0-28fa-b700-932b-3de5ce3fe965@intel.com>
Date:   Thu, 17 Nov 2022 17:18:19 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.4.2
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Zhang Rui <rui.zhang@intel.com>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
CC:     Guenter Roeck <linux@roeck-us.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20221117122904.6759427e@canb.auug.org.au>
Content-Language: en-US
From:   "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Organization: Intel Technology Poland Sp. z o. o., KRS 101882, ul. Slowackiego
 173, 80-298 Gdansk
In-Reply-To: <20221117122904.6759427e@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a0Yxc1pkOENPOWJDVlhpUXJpeUxJa0l3OHl1SVFGQmlHYlZWY1FtTmNScHN6?=
 =?utf-8?B?QlpkRWRCU09abEM0SERCOVdLYWtyZ1FXSFJNTXNJTEl2SXhFSmxJSjgvRW5z?=
 =?utf-8?B?QWRLSXNCb3UzY3lNbGVMS3pHN1dadEFPZnhFcy9hSzczTzZhMTRTOXhRdWxm?=
 =?utf-8?B?a3JDR3NhSWhhZ2k2UHBONFRwZllNNW8rcFp1M2YvZjlCbDlKYjhsNk40dDZs?=
 =?utf-8?B?a3FSRCttcDlUazUvYUlXcGllQlZZTkduWG9RS2JQOXBMbmdhYXBrZEpSZW1p?=
 =?utf-8?B?K2ZZU1pkb0xEYUNwbWtDU2hpT0dKMVp5aUo3RzIrMWRrdGM4Q2o0K1VITklL?=
 =?utf-8?B?SCs1UG9teG9YWGpPNnZyNmRYaG81N1o4UE4rWll1RWhvVXN1bTV2alNBTG9P?=
 =?utf-8?B?S3dHaWcrY2MyR1B5NzZyU2l6QjZsVjV4b1hnQit6OGY2YXVXaytROTU1SXhW?=
 =?utf-8?B?aE1BVWpuYU1xdWZBb0U3VHUzSmlrQlQzOWUzK1dzK0dkRGl3YUJ6Mk11elJ0?=
 =?utf-8?B?WG9GM3dCMDJOUjNGejF4T2dscHo3dzJRZG9uZndZYVhtdDEvNTVyeHcrcjRk?=
 =?utf-8?B?RjNHWk1YNU1XdHZtaDJ5S2ozSE9EVlFrbUtLc25pdkVXU01NeDdQMHpZQXl4?=
 =?utf-8?B?cTRvcWc0dUF0MWRqdWhLMVNNRnNsbU9nZ2NjYnBzTCt5cGx6UUxBUldmcjNC?=
 =?utf-8?B?M3IvalhTSUN6TExqNHc0ZW9WdjNscUltcjRiK1FLZlR3cjRWNjdjZk5GdW5z?=
 =?utf-8?B?cHIzNlpoek9ZWnVuZFFkN2hVeCtLdEFZYU1POVZqeFBSUW0ralpzVytETnpv?=
 =?utf-8?B?azJGaXJtT0NtNWs0bHFoc2Q4dTZVQnJyNkdMVGZDM2tBZW4yR0Nld0NhdFBM?=
 =?utf-8?B?TVBSemtMVmlIaUx1SXovZXBBdDFHeENadFZKQXNVa1VOSEJ2akVyVnN5a0hV?=
 =?utf-8?B?MnJMOFBsaytycG9DZWFhb0wrbGxzN3VlZCtZQm5aaVdMcElUYnZBVXBOTnBx?=
 =?utf-8?B?UUp2MnlEQlpXZUdZN1Y5d3N2UXZvUVF6ZVdxNTFqWVYzam55QkVxZHVZRkhD?=
 =?utf-8?B?bjQxaEdOSTNqaXJxVnEvK2xHM0RqNERLQUJTbEljcUJVdldpcEtqZUlkQWZG?=
 =?utf-8?B?VkUvQkRnOXMrZzRZYmM2OHFHRzlVSHhVRFhhWGlYRS9WRExRSlBod08zWXBU?=
 =?utf-8?B?M2ZWZ2ExODc4UFpZREJIVUpMaS9sOEtqNmQycEV1NDFHenJRYUFoakZqQm4r?=
 =?utf-8?B?QU9zbFVGRXpwQTgzRVphNnJCMHMreE9meDkzVytYT3EraEVGSTNtdUJjVWJT?=
 =?utf-8?B?d0lzOWhpazdiK0FjdGtkR25SVjdCQ3BaV0VIVHNJSEthV1ZTNTMvUExvb2kr?=
 =?utf-8?B?STJVTVpqS1BoTURDeUJEOXhhVTgvV1RnV2FGZHBETlVTMDlNWFN2Tlg3emVi?=
 =?utf-8?B?QWI4bGkvREZPaWw4OUpUbzRENi9EeDl0MFRIby9pRzY1MHFrdnNYL0tqRTVW?=
 =?utf-8?B?Z3JZYTJwcEl4NFRTa1hZRWM5MWhubVAwZ0lsVzJPLytxeEFQRU9NeGtQcFVK?=
 =?utf-8?B?eVp1dDNGdXN6b3gvckdaSTMzYitka2Z1VUN3emcrcHh0cHZFd3VIS29WdVVP?=
 =?utf-8?B?UllvVTlvaVQzL29WM2lSV2I0cU40bFhaYkowZTRwZEhrYm1NazRISTFhWGp1?=
 =?utf-8?B?MW1zN0M4ZVh4ZWhtRFI4MUg1aWZJSmw5RUVXb3ZpUWd6UVZaaHI4WFEvaUVQ?=
 =?utf-8?B?MU9xYjNDYjhpMnVPYmtBSG1LQWpUUi80RXlxOGl4RnlreGlpV3l3WHlwVjlH?=
 =?utf-8?B?SWtFSUJxNndwTHVNMXhMdWNENjhZczF4ZVZ4T0NQaUhwNnEybndHY0lpcXVu?=
 =?utf-8?B?REN5WlNZcGw5cTFud2dodzFOR0xKS2QzVXUyUithN3N5VHhtK0VTTUIyMEov?=
 =?utf-8?B?Z1FOQkFnc2RTRVBsZXVQTlgvbVpyZEhYbWhBaWFWZmJ1cnRyb1UrRGtVRVJt?=
 =?utf-8?B?YUZvbGcwdUJiTTliVk9oOWlyZUNyK3VsRzU0ZnU4R3l1dG1MWFhETlFMeU8x?=
 =?utf-8?B?djBacjRnbTNsZG1XclI1MlprN21GazA4MFEvbjZnU0QrYVdjZ1U3YS9qQTBk?=
 =?utf-8?B?LzlEblFTWlpTczhQRm9QZlhUcGdpaXZ5Nmd5b0c1ZG1CVWJYajZqRkV3SjYv?=
 =?utf-8?B?WXc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 03610353-d353-4096-06e0-08dac8b75aec
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2022 16:18:27.5093
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BY1HsGFzP34umxzeszBCoZ8ot1Y+Iu0gIdqFZgzsTEjfnd2be8D5BxMbRO87/QLgnxLhKcNXPTW3ELZfFawT1EFfmCwhdUHCnzMiA7pd3vA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4691
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Stephen,

On 11/17/2022 2:29 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
>    drivers/thermal/thermal_sysfs.c
>
> between commit:
>
>    05eeee2b51b4 ("thermal/core: Protect sysfs accesses to thermal operations with thermal zone mutex")
>
> from the pm tree and commits:
>
>    dca20ad5acb7 ("thermal/core: Add a generic thermal_zone_get_trip() function")
>    aed8b46d141c ("thermal/core: Add a generic thermal_zone_set_trip() function")
>
> from the thermal tree.
>
> This was just too painful to fix up, so please fix it yourselves or
> supply me with a resolution.
>
> I have dropped the thermal tree for today.
>
 From my perspective, the current material in the thermal tree is work 
in progress and the thermal tree is merged via the pm tree anyway.

So I think that it would be better to merge it into linux-next through 
the linux-next branch of the pm tree as a general rule.

In my view the material from Guenter is important bug fixes and it takes 
precedence over any cleanups and new code.

In any case, sorry for the trouble.