diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 08:40:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 08:40:15 +0200 |
| commit | 1b5a5f59e3435337bede67b9255bbb1d39fc4827 (patch) | |
| tree | c604f571dcc7bb26dfe5498eb920873248639c62 /Makefile | |
| parent | Merge tag 'upstream-3.18-rc1-v2' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | fs/fscache/object-list.c: use __seq_open_private() (diff) | |
| download | linux-dev-1b5a5f59e3435337bede67b9255bbb1d39fc4827.tar.xz linux-dev-1b5a5f59e3435337bede67b9255bbb1d39fc4827.zip | |
Merge tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull fs-cache fixes from David Howells:
"Two fixes for bugs in CacheFiles and a cleanup in FS-Cache"
* tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
fs/fscache/object-list.c: use __seq_open_private()
CacheFiles: Fix incorrect test for in-memory object collision
CacheFiles: Handle object being killed before being set up
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions