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: <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com>
Date:   Mon, 28 Nov 2022 13:51:53 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.5.0
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>,
        <rafael@kernel.org>
References: <20221117122904.6759427e@canb.auug.org.au>
 <20221128102212.39f90b0c@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: <20221128102212.39f90b0c@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?VE9kT2VuNHlhMGNhRmhrMHNwTGxCZi85SUdMSGZDaWtPKzVIM3pIcUp4YkRy?=
 =?utf-8?B?c2twTjJ3enJRU1pVU2RoR2owTVN2VnVUVUdDeGhqYzVNVTN6VDZIOWVlRzB2?=
 =?utf-8?B?bDV6b01PdDB3ODBxOFpENUY2MHNrYlhBM0oybE52Wk9VYk5zRkVKSHNOOG4r?=
 =?utf-8?B?Sm83bDExaG1Vc0RCTmJQM1ZoYzFyRmJ1UEJ6NmpmUE1sdUR5TDZEKzFQQ0o2?=
 =?utf-8?B?cHFJbmtLcEZnZGRHUUMzVnQrRmhBRGtXYVBKMmhBWkgzS0c2WUUxV3RLQnB2?=
 =?utf-8?B?dHBNeHhpVGJhRUpFQnhweU50d21naCtkTU9CTHllUFFHT0x2RnBpRkdxSGo4?=
 =?utf-8?B?dEFKNVVyWXRqSCtlZW1YanpmS2M0L0lJM3pyOEdVMXBPTEtzQ0NFQWRFTGxW?=
 =?utf-8?B?ZktTRlFSdVpZWGIzeWdqcWxYWUEwbVpVcHJsQTN1NUY1OWpPaWJrRnZ2Z2hP?=
 =?utf-8?B?aGdtOHJucFNObFRZMmE5cXg4SmN1YUJDSnBicVJ1d29SeTJhWml0TzQwTHZo?=
 =?utf-8?B?L0ExQjRpKy9nazRsS3FtNlpRMktwSXZXcTNHbm5MTDZiczZlSlRpaCtZaG9M?=
 =?utf-8?B?WksveFBPMkcxM2hWcEwzVjFaVUNja3NwMlR1TXFpbERyZy9naFF3VnVINlQ1?=
 =?utf-8?B?VUVHVU0wcTR5ODdYNW9NZG52djJ4d2hlQjhEaDUxTUVmQ3VFTlpLTEJ1MUZV?=
 =?utf-8?B?Sk5WM0YxckdTR2dHeUZRZXErUWdYSGRCc2o2Z0hZYnU0S2gwOCt4dGljSXp2?=
 =?utf-8?B?ZWZ5NXNibEtiR0FQV24wYkdwWDR2dG0yOW5vSys0ZDU1bHZZTjZSc0hKTWNF?=
 =?utf-8?B?aFY5d2JpYmpqUW91WE43czZ6eGduR2JFaDVDeFdKTjNtWURPNVpFRkEvNWVP?=
 =?utf-8?B?TG9xR2cwa2FRTG1XbEh6MDNkNTltSjdBN0FxdllpQ0l1S05ENCt6TWs3bkJs?=
 =?utf-8?B?bElqVDZJTExTdVZoR0tYa0xXQ3phdktWZHdZY3V3YXJaZ0YwV3hNYkVFbnlu?=
 =?utf-8?B?cGdpcUdyblozRmJheHJRMS9zRUxIaWdpbGxsaDdrODlzbXQ2anRRVFNqc0NL?=
 =?utf-8?B?Z3ZRTDRFQVhHbVV4dGRNRWM5b1hOZDY5QjBacUtDVHpjRlVsUlpPdCs1cUc1?=
 =?utf-8?B?azVRVkJNRkR2UHZndmI0VDN1ZVl5MStHYmFSZXRPYVlsN1JncExCRlhFdmIr?=
 =?utf-8?B?S2NFTXZQN0NqYWhYZVdncVQvUlBVemthOW9JYUhURHlTVmdUbFpuVGdacEJP?=
 =?utf-8?B?RFpUc0tjOWUxajJiS1lYa3FUczFPb2xOMUdyVm1aTDdlS3A2Q3hCR210b21W?=
 =?utf-8?B?UTJTTm5FTkJOeXBDWWllSDEvaW9FcUNkQkNFNDVBMzJJdWN6U3dyTkwyblh3?=
 =?utf-8?B?cnVsaTR6a0g1VE9pTEdQUzBxS1A1K1lXWTBPQ211dUd3ZklVZXNqV2JOMmNk?=
 =?utf-8?B?SW40QkI2UUFEV2NpVUR3VzRVdTBNczlpSSs5WktSNy9sZUI0YnZ6ZmM2OW1Q?=
 =?utf-8?B?dWRFRWl6NTQxWG96dVpJdjVpNUV3WjZqSkZKN2psRWJVRTA0SXJGSS8zcXR1?=
 =?utf-8?B?K0NLVE14RHlhT20za3B4UVc1N2JiZ25VTExHV3NrNkViL21uWnhQU0ZxQm92?=
 =?utf-8?B?aTUwNjMrRTJiYnN2Y0ZMa01LQVVqaGh2NC9YU3FPMWdqZG9wSGtFRCs0TXpY?=
 =?utf-8?B?UkwvNlp0cEVqT1ZTdXdOWVV3UjJpRmNTa3BhL1V6azR1UHNhVFFqcXZ4RE0r?=
 =?utf-8?B?eFl6clNySUN5K0xLbU95cUY1UlBmNUttbWxieTBLSFkrQTVmbFk1emJyL0gx?=
 =?utf-8?B?UDREbXFSdGpsQXkydlZpd0xxV21BYWs4WE5SbXBwT1IyOWg2NDBhTTlwZWV3?=
 =?utf-8?B?V3hza2IySXgrbXpVQWVaTlhPYnQ1Uzd4ZFNIMUdFWm85ZVlTblNzT3l3QUlV?=
 =?utf-8?B?SHJPbVp0b25sZFR0c1hxTFBXRlB2aUFxM0ZJUjZrL0VNTkdhMDdxUis1amdk?=
 =?utf-8?B?cEhhOUF2cTZ0Q0k0SXhxd09xSVBKNXZ6WldSb2JGV0Qxd3VEQnUyZVB6Y2RT?=
 =?utf-8?B?TWF4NDJhMklFRmk2MjVGVm1RYThCamZ1ejV6ZitxMUkyLzNSdmFLSUNzYUpY?=
 =?utf-8?B?MjRSMG1Ba1hCZUc1OHUydm5GOHZVb01GbGJITjVudG04VkZTaWFlZ20vbmtr?=
 =?utf-8?B?aEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7b12a20e-2659-4dd1-26ca-08dad13f56e6
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 12:52:01.4456
 (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: mT8+59Y3FgMCc516iONpPajA2l8DLg9Cgc4AWOqp+1eMJ5knNQGYMyMUn/g7YSf2MGRP5AYs1nkz3RrGG+QshZuJBLyXF0k7dd2c0oRQlZM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5016
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.7 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_MED,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/28/2022 12:22 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 17 Nov 2022 12:29:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> 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.
> I am still not merging the thermal tree ...
>
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?

Thanks,

Rafael