summaryrefslogtreecommitdiffstats
path: root/fs/proc/consoles.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2024-07-03 10:20:05 -0600
committerJens Axboe <axboe@kernel.dk>2024-07-03 10:20:05 -0600
commit1a50d1467077c0d6f504bdbb66e6fa0dcd5b3b01 (patch)
treeec53ad1b708908c196190a75721f72c2ee0489bc /fs/proc/consoles.c
parent98d34c087249d39838874b83e17671e7d5eb1ca7 (diff)
parent22a40d14b572deb80c0648557f4bd502d7e83826 (diff)
downloadlinux-stable-1a50d1467077c0d6f504bdbb66e6fa0dcd5b3b01.tar.gz
linux-stable-1a50d1467077c0d6f504bdbb66e6fa0dcd5b3b01.tar.bz2
linux-stable-1a50d1467077c0d6f504bdbb66e6fa0dcd5b3b01.zip
Merge tag 'v6.10-rc6' into for-6.11/block-post
Pull in v6.10-rc6 to resolve a conflict for the integrity cleanups. * tag 'v6.10-rc6': (778 commits) Linux 6.10-rc6 ata: ahci: Clean up sysfs file on error ata: libata-core: Fix double free on error ata,scsi: libata-core: Do not leak memory for ata_port struct members ata: libata-core: Fix null pointer dereference on error x86-32: fix cmpxchg8b_emu build error with clang x86: stop playing stack games in profile_pc() i2c: testunit: discard write requests while old command is running i2c: testunit: don't erase registers after STOP tty: mxser: Remove __counted_by from mxser_board.ports[] randomize_kstack: Remove non-functional per-arch entropy filtering string: kunit: add missing MODULE_DESCRIPTION() macros ata: libata-core: Add ATA_HORKAGE_NOLPM for all Crucial BX SSD1 models MAINTAINERS: Update IOMMU tree location tools/power turbostat: Add local build_bug.h header for snapshot target tools/power turbostat: Fix unc freq columns not showing with '-q' or '-l' tools/power turbostat: option '-n' is ambiguous drm/drm_file: Fix pid refcounting race kallsyms: rework symbol lookup return codes gpiolib: cdev: Ignore reconfiguration without direction ... Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/proc/consoles.c')
0 files changed, 0 insertions, 0 deletions