From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Jul 2024 19:13:48 +0000 (-0700)
Subject: Merge tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=539fbb912321ab6361ccc08b72f5f83e8a25c24b;p=linux.git

Merge tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
 "Fix a flood of kernel messages coming from the thermal core on systems
  where iwlwifi is loaded, but the network interfaces controlled by it
  are down (Rafael Wysocki)"

* tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: core: Allow thermal zones to tell the core to ignore them
---

539fbb912321ab6361ccc08b72f5f83e8a25c24b