tree fcfcca99d9d9c49a03d825ddaecabe0163c924eb
parent bbc780f8bab52fef1784151d3c4982cb1143edd2
parent a8b14744429f90763f258ad0f69601cdcad610aa
author Tejun Heo <tj@kernel.org> 1386682848 -0500
committer Tejun Heo <tj@kernel.org> 1386683077 -0500

Merge branch 'driver-core-linus' into driver-core-next

a8b14744429f ("sysfs: give different locking key to regular and bin
files") in driver-core-linus modifies sysfs_open_file() so that it
gives out different locking classes to sysfs_open_files depending on
whether the file is bin or not.  Due to the massive kernfs
reorganization in driver-core-next, this naturally causes merge
conflict in fs/sysfs/file.c.

Due to the way things are split between kernfs and sysfs in
driver-core-next, the same fix can't easily be applied to
driver-core-next.  This merge simply ignores the offending commit.  A
following patch will implement a separate fix for the issue.

Signed-off-by: Tejun Heo <tj@kernel.org>