diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
| commit | a8fa94e0f2ab665f9aa665195618178b61ed8304 (patch) | |
| tree | 4060502fffd7f56d379372d517f8dcc31bf63955 /drivers/base | |
| parent | 9561a8961c708ff6ba3e71a817af0f16bdc1d885 (diff) | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (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
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions