From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Oct 2014 06:40:15 +0000 (+0200)
Subject: Merge tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.18-rc1~47
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b5a5f59e3435337bede67b9255bbb1d39fc4827;p=users%2Fjedix%2Flinux-maple.git

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
---

1b5a5f59e3435337bede67b9255bbb1d39fc4827