projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b11445f d5d9622)
Merge tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 06:40:15 +0000 (08:40 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 06:40:15 +0000 (08:40 +0200)
commit1b5a5f59e3435337bede67b9255bbb1d39fc4827
treec604f571dcc7bb26dfe5498eb920873248639c62tree | snapshot
parentb11445f830df0ec9271f39bff19ecc6f8db58eb8commit | diff
parentd5d962265d99088ce96480db3e61358d7170e24ccommit | diff
Merge tag 'fscache-fixes-20141013' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.