Merge tag '9p-for-4.21' of git://github.com/martinetd/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2019 20:11:01 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2019 20:11:01 +0000 (12:11 -0800)
commit85f78456f286da46fb054c7d45e4193cb757ac83
treea33bfd4efc03c05a12944456c2f217c83ce5f9d6
parentcacf02df4b84d261d76db3d290ccb6b951df28c0
parent574d356b7a02c7e1b01a1d9cba8a26b3c2888f45
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.