diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-27 11:33:01 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-27 11:33:01 -0600 |
| commit | b06e13c38dbd5a03e945ce711f6909c91888f507 (patch) | |
| tree | 5d4514f49463e014d6b40c646796a88ba13d9c09 /scripts/patch-kernel | |
| parent | nvme: Add nvme_core.force_apst to ignore the NO_APST quirk (diff) | |
| parent | nvme-scsi: remove nvme_trans_security_protocol (diff) | |
| download | linux-b06e13c38dbd5a03e945ce711f6909c91888f507.tar.gz linux-b06e13c38dbd5a03e945ce711f6909c91888f507.zip | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge
Christoph writes:
"A couple more updates for 4.12. The biggest pile is fc and lpfc
updates from James, but there are various small fixes and cleanups as
well."
Fixes up a few merge issues, and also a warning in
lpfc_nvmet_rcv_unsol_abort() if CONFIG_NVME_TARGET_FC isn't enabled.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions