diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-24 12:57:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-24 12:57:06 -0700 |
| commit | 4d4a60cede3604208c671f5a73a6edd094237b13 (patch) | |
| tree | ee6f34b7bb858e18aab35700c6650480dae3aa8d /net/unix/af_unix.c | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | Merge tag 'nvme-5.14-2021-07-22' of git://git.infradead.org/nvme into block-5.14 (diff) | |
| download | wireguard-linux-4d4a60cede3604208c671f5a73a6edd094237b13.tar.xz wireguard-linux-4d4a60cede3604208c671f5a73a6edd094237b13.zip | |
Merge tag 'block-5.14-2021-07-24' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- NVMe pull request (Christoph):
- tracing fix (Keith Busch)
- fix multipath head refcounting (Hannes Reinecke)
- Write Zeroes vs PI fix (me)
- drop a bogus WARN_ON (Zhihao Cheng)
- Increase max blk-cgroup policy size, now that mq-deadline
uses it too (Oleksandr)
* tag 'block-5.14-2021-07-24' of git://git.kernel.dk/linux-block:
nvme: set the PRACT bit when using Write Zeroes with T10 PI
nvme: fix nvme_setup_command metadata trace event
nvme: fix refcounting imbalance when all paths are down
nvme-pci: don't WARN_ON in nvme_reset_work if ctrl.state is not RESETTING
block: increase BLKCG_MAX_POLS
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions