diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:07:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:07:34 +1100 |
| commit | 9e207b793fd6fe003b2292dc13e669f932955147 (patch) | |
| tree | d3f09fbc9cdc22ae17e9f8aa8b8d1b4b65045500 /MAINTAINERS | |
| parent | 13d9d316cbbc0a22c486c35194b8fba8ae97d28f (diff) | |
| parent | 8cf4433a8295e8908731819303395d613bd9eb95 (diff) | |
Merge remote-tracking branch 'block/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bf58c35f96b4..b722a63c11b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8649,10 +8649,10 @@ S: Maintained F: drivers/net/ethernet/netronome/ NETWORK BLOCK DEVICE (NBD) -M: Markus Pargmann <mpa@pengutronix.de> +M: Josef Bacik <jbacik@fb.com> S: Maintained +L: linux-block@vger.kernel.org L: nbd-general@lists.sourceforge.net -T: git git://git.pengutronix.de/git/mpa/linux-nbd.git F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c F: include/uapi/linux/nbd.h @@ -11179,6 +11179,17 @@ L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-spear.c +SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER +M: Scott Bauer <scott.bauer@intel.com> +M: Jonathan Derrick <jonathan.derrick@intel.com> +M: Rafael Antognolli <rafael.antognolli@intel.com> +L: linux-nvme@lists.infradead.org +S: Supported +F: block/sed* +F: block/opal_proto.h +F: include/linux/sed* +F: include/uapi/linux/sed* + SECURITY SUBSYSTEM M: James Morris <james.l.morris@oracle.com> M: "Serge E. Hallyn" <serge@hallyn.com> |