diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 13:32:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 13:32:06 -0700 |
| commit | 9f76628da20f96a179ca62b504886f99ecc29223 (patch) | |
| tree | 0557dab127d1650294565f824466ff6032dbb876 /security/integrity/ima/ima_appraise.c | |
| parent | Merge tag 'trace-fixes-v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | nfsd4: fix crash on unknown operation number (diff) | |
| download | linux-dev-9f76628da20f96a179ca62b504886f99ecc29223.tar.xz linux-dev-9f76628da20f96a179ca62b504886f99ecc29223.zip | |
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
Pull two nfsd fixes from Bruce Fields:
"One regression from the 3.16 xdr rewrite, one an older bug exposed by
a separate bug in the client's new SEEK code"
* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix crash on unknown operation number
nfsd4: fix response size estimation for OP_SEQUENCE
Diffstat (limited to 'security/integrity/ima/ima_appraise.c')
0 files changed, 0 insertions, 0 deletions