summaryrefslogtreecommitdiffstats
path: root/fs/fuse/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-05 18:52:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-05 18:52:30 +0200
commit06c85639897cf3ea6a11c5cb6929fb0d9d7efea5 (patch)
treebe08765a6d84e147ff28662f99425838501b95d5 /fs/fuse/file.c
parentMerge tag 'pm-4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff)
parentMerge branches 'acpi-tables' and 'acpica' (diff)
downloadlinux-06c85639897cf3ea6a11c5cb6929fb0d9d7efea5.tar.xz
linux-06c85639897cf3ea6a11c5cb6929fb0d9d7efea5.zip
Merge tag 'acpi-4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These fix a recent ACPICA regression, fix a battery driver regression introduced during the 4.17 cycle and fix up the recently added support for the PPTT ACPI table. Specifics: - Revert part of a recent ACPICA regression fix that added leading newlines to ACPICA error messages and made the kernel log look broken (Rafael Wysocki). - Fix an ACPI battery driver regression introduced during the 4.17 cycle due to incorrect error handling that made Thinkpad 13 laptops crash on boot (Jouke Witteveen). - Fix up the recently added PPTT ACPI table support by covering the case when a PPTT structure represents a processors group correctly (Sudeep Holla)" * tag 'acpi-4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / battery: Safe unregistering of hooks ACPI / PPTT: use ACPI ID whenever ACPI_PPTT_ACPI_PROCESSOR_ID_VALID is set ACPICA: Drop leading newlines from error messages
Diffstat (limited to 'fs/fuse/file.c')
0 files changed, 0 insertions, 0 deletions