git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cacf02d 574d356)
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)
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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.