diff options
| author | Tejun Heo <tj@kernel.org> | 2013-12-10 14:40:48 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-12-10 14:44:37 +0100 |
| commit | 13ccb93f4127baf53961a9497780a0f52e3c24e7 (patch) | |
| tree | fcfcca99d9d9c49a03d825ddaecabe0163c924eb /drivers/gpio/gpio-xilinx.c | |
| parent | driver core: fix device_create() error path (diff) | |
| parent | sysfs: give different locking key to regular and bin files (diff) | |
| download | linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.tar.xz linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.zip | |
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>
Diffstat (limited to 'drivers/gpio/gpio-xilinx.c')
0 files changed, 0 insertions, 0 deletions