]> www.infradead.org Git - users/hch/block.git/commit
projects / users / hch / block.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 9561a89 b28a960)
Merge branch 'master' into driver-core-next-test-merge-rc2
authorTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 00:34:30 +0000 (19:34 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 00:34:30 +0000 (19:34 -0500)
commita8fa94e0f2ab665f9aa665195618178b61ed8304
tree4060502fffd7f56d379372d517f8dcc31bf63955tree
parent9561a8961c708ff6ba3e71a817af0f16bdc1d885commit | diff
parentb28a960c42fcd9cfc987441fa6d1c1a471f0f9edcommit | diff
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
dir.c | | blob
Unnamed repository; edit this file 'description' to name the repository.