summaryrefslogtreecommitdiffstats
path: root/fs/logfs/gc.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-02-10 19:34:30 -0500
committerTejun Heo <tj@kernel.org>2014-02-10 19:34:30 -0500
commita8fa94e0f2ab665f9aa665195618178b61ed8304 (patch)
tree4060502fffd7f56d379372d517f8dcc31bf63955 /fs/logfs/gc.c
parent9561a8961c708ff6ba3e71a817af0f16bdc1d885 (diff)
parentb28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff)
downloadop-kernel-dev-a8fa94e0f2ab665f9aa665195618178b61ed8304.zip
op-kernel-dev-a8fa94e0f2ab665f9aa665195618178b61ed8304.tar.gz
Merge branch 'master' into driver-core-next-test-merge-rc2
da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP flag") in driver-core-linus conflicts with kernfs_drain() updates in driver-core-next. The former just adds the missing KERNFS_LOCKDEP checks which are already handled by kernfs_lockdep() checks in driver-core-next. The conflict can be resolved by taking code from driver-core-next. Conflicts: fs/kernfs/dir.c
Diffstat (limited to 'fs/logfs/gc.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud