diff options
| author | Tejun Heo <tj@kernel.org> | 2013-12-10 08:40:48 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-12-10 08:44:37 -0500 |
| commit | 13ccb93f4127baf53961a9497780a0f52e3c24e7 (patch) | |
| tree | fcfcca99d9d9c49a03d825ddaecabe0163c924eb /arch/parisc/configs/c3000_defconfig | |
| parent | bbc780f8bab52fef1784151d3c4982cb1143edd2 (diff) | |
| parent | a8b14744429f90763f258ad0f69601cdcad610aa (diff) | |
| download | blackbird-op-linux-13ccb93f4127baf53961a9497780a0f52e3c24e7.tar.gz blackbird-op-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 'arch/parisc/configs/c3000_defconfig')
| -rw-r--r-- | arch/parisc/configs/c3000_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index ec1b014952b6..acacd348df89 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig @@ -50,7 +50,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_NS87415=y -CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_PATA_SIL680=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y |
