NVMe problems - (Samsung SM961/PM961) - target version

[FreeNAS_User1984]

Hi All,

I am impacted by this "issue" => NVME controller failure: resetting (Samsung SM961 SSD Drives) - long thread
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211713

I have found that this comes directly from FreeBSD kernel (PCI Local Bus) and way of handling interrupt. (on that specific samsung device)

And now I am little bit confused about FreeNAS to FreeBSD versioning

The question is:
in which version of FreeNAS this fix will be merged ?

FreeNAS 11.1 - based on FreeBSD 11 Stable
FreeNAS 11.2-U? - based on FreeBSD 11.2 Stable
FreeNAS 11.3-Master(Nightly) - based on FreeBSD 11.3 Release
FreeNAS 12-Master - based on FreeBSD 12.1-PRERELEASE
TrueNAS ?

Is there any official statement (documentation) regardig "versioning" ?

I saw revision e29db31f by Warner Losh (imp)
https://redmine.ixsystems.com/proje...ions/e29db31f1eae45935fc7322dd23d8004c2cd1fa3

I saw commit to src here (12-Stable) => https://github.com/freenas/os/tree/freenas/12-stable/sys/dev/pci
pci.c MFC r349845: 26 days ago
MFC r349845: Work around devices which return all zeros for reads of existing MSI-X table VCTRL registers. Note:
This is confirmed to fix the nvme lost interrupt issues, seen on both virtual and real cards. PR: 211713

But there is no commit to (11-Stable) ? = > https://github.com/freenas/os/tree/freenas/11-stable/sys/dev/pci

Details:
https://svnweb.freebsd.org/base/stable/12/sys/dev/pci/pci.c?r1=351915&r2=351914&pathrev=351915
Author: imp
Date: Thu Sep 5 23:54:44 2019 UTC (3 weeks, 5 days ago)
Changed paths: 2
Log Message:
MFC r349845:

Work around devices which return all zeros for reads of existing MSI-X table
VCTRL registers.

Note: This is confirmed to fix the nvme lost interrupt issues, seen on both
virtual and real cards.
PR: 211713
Reviewed By: imp, jhb
Submitted by: Ka Ho Ng
Diff of /stable/12/sys/dev/pci/pci.c

https://svnweb.freebsd.org/base/stable/11/sys/dev/pci/pci.c?r1=351917&r2=351916&pathrev=351917
Author: imp
Date: Fri Sep 6 00:06:55 2019 UTC (3 weeks, 3 days ago)
Changed paths: 2
Log Message:
MFC r349845:

Work around devices which return all zeros for reads of existing MSI-X table
VCTRL registers.

PR: 211713
Reviewed By: imp, jhb
Submitted by: Ka Ho Ng
Diff of /stable/11/sys/dev/pci/pci.c

Thank you in advance for Your anwser.