diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 20:31:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 20:31:50 +0200 |
| commit | 2794b5d408c625e104de813d3de7ac0ec34d46d9 (patch) | |
| tree | a99e067475ed4e1de27c86a544347be97e7458fb /block | |
| parent | Merge tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge 3.9-rc7 into driver-core-next (diff) | |
| download | linux-2794b5d408c625e104de813d3de7ac0ec34d46d9.tar.xz linux-2794b5d408c625e104de813d3de7ac0ec34d46d9.zip | |
Merge tag 'driver-core-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg Kroah-Hartman:
"Here's the merge request for the driver core tree for 3.10-rc1
It's pretty small, just a number of driver core and sysfs updates and
fixes, all of which have been in linux-next for a while now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed conflict in kernel/rtmutex-tester.c, the locking tree had a better
fix for the same sysfs file mode problem.
* tag 'driver-core-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
PM / Runtime: Idle devices asynchronously after probe|release
driver core: handle user namespaces properly with the uid/gid devtmpfs change
driver core: devtmpfs: fix compile failure with CONFIG_UIDGID_STRICT_TYPE_CHECKS
devtmpfs: add base.h include
driver core: add uid and gid to devtmpfs
sysfs: check if one entry has been removed before freeing
sysfs: fix crash_notes_size build warning
sysfs: fix use after free in case of concurrent read/write and readdir
rtmutex-tester: fix mode of sysfs files
Documentation: Add ABI entry for crash_notes and crash_notes_size
sysfs: Add crash_notes_size to export percpu note size
driver core: platform_device.h: fix checkpatch errors and warnings
driver core: platform.c: fix checkpatch errors and warnings
driver core: warn that platform_driver_probe can not use deferred probing
sysfs: use atomic_inc_unless_negative in sysfs_get_active
base: core: WARN() about bogus permissions on device attributes
device: separate all subsys mutexes
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 3c001fba80c7..20625eed5511 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1111,7 +1111,8 @@ struct class block_class = { .name = "block", }; -static char *block_devnode(struct device *dev, umode_t *mode) +static char *block_devnode(struct device *dev, umode_t *mode, + kuid_t *uid, kgid_t *gid) { struct gendisk *disk = dev_to_disk(dev); |