[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20221117122904.6759427e@canb.auug.org.au>
Date: Thu, 17 Nov 2022 12:29:04 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@...aro.org>,
Zhang Rui <rui.zhang@...el.com>,
"Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: Guenter Roeck <linux@...ck-us.net>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: linux-next: manual merge of the thermal tree with the pm tree
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.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists