diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-30 14:04:08 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-30 14:04:08 -0600 |
| commit | 6e34e784e72132c91b03d4f2f85bd4725b1ad9e5 (patch) | |
| tree | 322d69c0d212c62d88a5c817ef8968a9c1cfe81f /drivers/nvme/target | |
| parent | a587b046ce921cc1805de6f0f000209b3644cadd (diff) | |
| parent | 4e69d4dabd2379af57b0b8fb9b0d62c23f9cd3b8 (diff) | |
| download | linux-stable-6e34e784e72132c91b03d4f2f85bd4725b1ad9e5.tar.gz linux-stable-6e34e784e72132c91b03d4f2f85bd4725b1ad9e5.tar.bz2 linux-stable-6e34e784e72132c91b03d4f2f85bd4725b1ad9e5.zip | |
Merge tag 'nvme-6.5-2023-06-30' of git://git.infradead.org/nvme into block-6.5
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.5
- Reduce spamming kernel logs on repeated controller updates (Breno)
- Improved struct packing (Christophe JAILLET)
- Misspelled command name in error logging (Damien)
- Failover fix for temporary frozen queue (Sagi)
- Reset error handling fixes (Keith)"
* tag 'nvme-6.5-2023-06-30' of git://git.infradead.org/nvme:
nvme: disable controller on reset state failure
nvme: sync timeout work on failed reset
nvme: ensure unquiesce on teardown
nvme-mpath: fix I/O failure with EAGAIN when failing over I/O
nvme: host: fix command name spelling
nvmet: Reorder fields in 'struct nvmet_ns'
nvme: Print capabilities changes just once
Diffstat (limited to 'drivers/nvme/target')
| -rw-r--r-- | drivers/nvme/target/nvmet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index 6cf723bc664e..8cfd60f3b564 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -79,8 +79,8 @@ struct nvmet_ns { struct completion disable_done; mempool_t *bvec_pool; - int use_p2pmem; struct pci_dev *p2p_dev; + int use_p2pmem; int pi_type; int metadata_size; u8 csi; |