Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[email protected] Wed, 25 Oct 2017 14:42:09 +0200

Newsgroups	gmane.linux.ports.mips.cvs
Message-ID	<S23990409AbdJYMmLLSB0y/[email protected]>

Author: Ralf Baechle <[email protected]> Wed Oct 25 14:41:07 2017 +0200
Commit: 037bd3c9af35597205b662cd1daca94f34321d4e
Gitweb: https://git.linux-mips.org/g/ralf/linux/037bd3c9af35
Branch: master

---

 arch/powerpc/kvm/book3s_64_vio.c        |   23 ++++++++++++--------
 arch/powerpc/kvm/book3s_hv_rmhandlers.S |   13 +++++++++--
 arch/powerpc/kvm/powerpc.c              |    3 +--
 net/sunrpc/xprt.c                       |   36 ++++++++++++++++++++++---------
 4 files changed, 50 insertions(+), 25 deletions(-)