tree 4060502fffd7f56d379372d517f8dcc31bf63955
parent 9561a8961c708ff6ba3e71a817af0f16bdc1d885
parent b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed
author Tejun Heo <tj@kernel.org> 1392078870 -0500
committer Tejun Heo <tj@kernel.org> 1392078870 -0500

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