]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4be460d 3ca8138)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2015 18:56:41 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2015 18:56:41 +0000 (10:56 -0800)
Pull fuse fixes from Miklos Szeredi:
 "Two bugfixes, both bound for -stable"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: break infinite loop in fuse_fill_write_pages()
  cuse: fix memory leak

1  2 
fs/fuse/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/fuse/file.c
Simple merge
XArray, radix tree and IDR