linux-kernel - linux-next: manual merge of the thermal tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230406103225.1ff571db@canb.auug.org.au>
Date:   Thu, 6 Apr 2023 10:32:25 +1000
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:     Amjad Ouled-Ameur <aouledameur@...libre.com>,
        Hsin-Yi Wang <hsinyi@...omium.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Kao <michael.kao@...iatek.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/mediatek/auxadc_thermal.c

between commit:

  10debf8c2da8 ("thermal/drivers/mediatek: Add delay after thermal banks initialization")

from the pm tree and commit:

  ed18ce7b06cc ("thermal/drivers/mediatek: Add delay after thermal banks initialization")

from the thermal tree.

I fixed it up (it is just a comment difference, so I used the former
version) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped