From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Jan 2019 20:11:01 +0000 (-0800)
Subject: Merge tag '9p-for-4.21' of git://github.com/martinetd/linux
X-Git-Tag: for-linus-20190104~14
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=85f78456f286da46fb054c7d45e4193cb757ac83;p=linux-block.git

Merge tag '9p-for-4.21' of git://github.com/martinetd/linux

Pull 9p updates from Dominique Martinet:
 "Missing prototype warning fix and a syzkaller fix when a 9p server
  advertises a too small msize"

* tag '9p-for-4.21' of git://github.com/martinetd/linux:
  9p/net: put a lower bound on msize
  net/9p: include trans_common.h to fix missing prototype warning.
---

85f78456f286da46fb054c7d45e4193cb757ac83