diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:46:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:46:13 +1100 |
| commit | dd85bbff2659e863de63cd9bf0ab4136676dc281 (patch) | |
| tree | 3a5b7a4c0e5ec269bc69a5e4e00666a5f98a0ae5 /MAINTAINERS | |
| parent | 4dc27eceb2c04bfec5bb055ffe0cd41ba831040a (diff) | |
| parent | 3fdb235081c49cdb700a4b5811897d3e98eedceb (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 a38f0022f8ee..d104c6492a02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8681,10 +8681,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 @@ -11214,6 +11214,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-block@vger.kernel.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> |