]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 's390-net'
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Mar 2017 19:40:00 +0000 (12:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Mar 2017 19:40:00 +0000 (12:40 -0700)
Ursula Braun says:

====================
s390/qeth patches for net

here are 2 s390/qeth patches built for net fixing a problem with AF_IUCV
traffic through HiperSockets.
And we come up with an update for the MAINTAINERS file to establish
Julian as Co-Maintainer for drivers/s390/net and net/iucv.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge