Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nvme fixes for Linux 6.11

Browse Source 
- Remove unused struct field (Nilay)
  - Fix fabrics keep-alive teardown order (Ming)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE3Fbyvv+648XNRdHTPe3zGtjzRgkFAmbHoJgACgkQPe3zGtjz
 RgknIg//YAa21/1p8VvimVqtwqV2QVnBdV62mXpxImTNTmkZ8bLgT+yJGFwOyDnD
 O+jlj5mELaufBaDcqq5ClWLOX75x9VIHq+mbGN5VdriYLQHbEe3IPGZjA7GFn1zK
 M09MtXl1mpkfXZPMxYDG8W69BB3meBQgHziZKHGAHvt2I3tRzA7JJA/3KlpXRMfY
 awbcikUqceZSp8/B1ygdkRG5FSakqGi3/VieBKzS5oYwzTu9xbhiSFSqmA3nc84V
 s+kT9ZRIi3w3Xa/0wWmKCmOfMbp54693mNM9oPzcGWtMIqoyqlSGHQeC6gLPJdeD
 aJgExcsgB1U+H2ZrEbRYRGHY4FGuyURI+atHMMhGYYTgzRJVmcrmse8EvdTA+Uyw
 QV9bMrutNvIwUwXrBAvOd8hb2ueYJgbVsbj1qY+rkN9Sc6xFPh+sEfQoL3M5vO6/
 yFWOLosgVTy0gjM7gzHL4/buSS99SmCiwbLvIlx8b/pv0Lzz6uBopUIB7zwc/zVm
 OfnDqbJvQ/TL92sVrbAfU0/+HR3ZdXbtEqDkDorxwXUvsyMkQuZudhgzFQGez5hV
 9HNUpAE9zaPfSgQbwdq3VaciNv0fbOVRjZi/WT5VeCtb7Hk+k3e5J1yc/YEIHqaX
 GdyP9KKwtQhobVUKfrijh1vCbQa8sRhO3L+A8rhJnqwPn42Rq5M=
 =VSK/
 -----END PGP SIGNATURE-----

Merge tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme into block-6.11

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.11

 - Remove unused struct field (Nilay)
 - Fix fabrics keep-alive teardown order (Ming)"

* tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme:
  nvme: Remove unused field
  nvme: move stopping keep-alive into nvme_uninit_ctrl()
This commit is contained in:
Jens Axboe 2024-08-22 16:20:24 -06:00
commit e6b09a1738
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nvme/host/core.c
View File

@ -4612,7 +4612,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl)
{
nvme_mpath_stop(ctrl);
nvme_auth_stop(ctrl);
nvme_stop_keep_alive(ctrl);
nvme_stop_failfast_work(ctrl);
flush_work(&ctrl->async_event_work);
cancel_work_sync(&ctrl->fw_act_work);
@ -4648,6 +4647,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl);
void nvme_uninit_ctrl(struct nvme_ctrl *ctrl)
{
nvme_stop_keep_alive(ctrl);
nvme_hwmon_exit(ctrl);
nvme_fault_inject_fini(&ctrl->fault_inject);
dev_pm_qos_hide_latency_tolerance(ctrl->device);

1
drivers/nvme/host/nvme.h
View File

@ -301,7 +301,6 @@ struct nvme_ctrl {
struct opal_dev *opal_dev;
char name[12];
u16 cntlid;
u16 mtfa;