From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jan 2024 18:58:51 +0000 (-0800)
Subject: Merge tag 'platform-drivers-x86-v6.7-7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.7-pxa1908~59
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5eff55d725a4e0dc6fc7709c4b1ca4fe40588d07;p=linux.git

Merge tag 'platform-drivers-x86-v6.7-7' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fix from Ilpo Järvinen:
 "Unfortunately the P2SB deadlock fix broke some older HW and we need
  some time to figure out the best way to fix the issue so reverting the
  deadlock fix for now"

* tag 'platform-drivers-x86-v6.7-7' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe"
---

5eff55d725a4e0dc6fc7709c4b1ca4fe40588d07