virtio_net: fix error handling for mergeable buffers

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 63f30484932b1cddbe5f9c5bd05ca6473d612e0b..8899c60046eb7bb264f22abcd7a43ddeddec7e75 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4044,6 +4044,12 @@ W:       http://www.pharscape.org
 S:     Maintained
 F:     drivers/net/usb/hso.c
 
+HSR NETWORK PROTOCOL
+M:     Arvid Brodin <arvid.brodin@alten.se>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/hsr/
+
 HTCPEN TOUCHSCREEN DRIVER
 M:     Pau Oliva Fora <pof@eslack.org>
 L:     linux-input@vger.kernel.org