diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 12:11:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 12:11:01 -0800 |
commit | 85f78456f286da46fb054c7d45e4193cb757ac83 (patch) | |
tree | a33bfd4efc03c05a12944456c2f217c83ce5f9d6 /fs/lockd | |
parent | Merge tag '4.21-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
parent | 9p/net: put a lower bound on msize (diff) | |
download | linux-dev-85f78456f286da46fb054c7d45e4193cb757ac83.tar.xz linux-dev-85f78456f286da46fb054c7d45e4193cb757ac83.zip |
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.
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions