Merge tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Oct 2019 19:49:32 +0000 (15:49 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Oct 2019 19:49:32 +0000 (15:49 -0400)
commit7f65d3541676a9f0e27f6545c6f53367fd248f7b
treefc318bc513b714bb48c2300c250497665e2e15ca
parent5fa2845fd794419fbeaf240aaa0c6d62ce6191cc
parentedffc70f505abdab885f4b4212438b4298dec78f
Merge tag 'acpi-5.4-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Fix locking issue in the error code path of a function that belongs to
  the sysfs interface exposed by the ACPI NFIT handling code (Dan
  Carpenter)"

* tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: NFIT: Fix unlock on error in scrub_show()