From: Tejun Heo Date: Tue, 10 Dec 2013 13:40:48 +0000 (-0500) Subject: Merge branch 'driver-core-linus' into driver-core-next X-Git-Tag: accepted/tizen/common/20141203.182822~776^2~59 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13ccb93f4127baf53961a9497780a0f52e3c24e7;p=platform%2Fkernel%2Flinux-arm64.git 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 --- 13ccb93f4127baf53961a9497780a0f52e3c24e7