diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-20 11:05:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-20 11:05:10 -0800 |
| commit | 61564e7b3abcb67d57b09afdb4b14b85f8bc1976 (patch) | |
| tree | e89982e6f90576d35dbf2cce520b554fbde16a58 /fs | |
| parent | Merge tag 'pinctrl-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| parent | blk-mq: don't insert FUA request with data into scheduler queue (diff) | |
| download | linux-dev-61564e7b3abcb67d57b09afdb4b14b85f8bc1976.tar.xz linux-dev-61564e7b3abcb67d57b09afdb4b14b85f8bc1976.zip | |
Merge tag 'block-5.16-2021-11-19' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Flip a cap check to avoid a selinux error (Alistair)
- Fix for a regression this merge window where we can miss a queue ref
put (me)
- Un-mark pstore-blk as broken, as the condition that triggered that
change has been rectified (Kees)
- Queue quiesce and sync fixes (Ming)
- FUA insertion fix (Ming)
- blk-cgroup error path put fix (Yu)
* tag 'block-5.16-2021-11-19' of git://git.kernel.dk/linux-block:
blk-mq: don't insert FUA request with data into scheduler queue
blk-cgroup: fix missing put device in error path from blkg_conf_pref()
block: avoid to quiesce queue in elevator_init_mq
Revert "mark pstore-blk as broken"
blk-mq: cancel blk-mq dispatch work in both blk_cleanup_queue and disk_release()
block: fix missing queue put in error path
block: Check ADMIN before NICE for IOPRIO_CLASS_RT
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig index 328da35da390..8adabde685f1 100644 --- a/fs/pstore/Kconfig +++ b/fs/pstore/Kconfig @@ -173,7 +173,6 @@ config PSTORE_BLK tristate "Log panic/oops to a block device" depends on PSTORE depends on BLOCK - depends on BROKEN select PSTORE_ZONE default n help |