Commit dcde56bb authored by Linus Torvalds's avatar Linus Torvalds

Fix mismerge due to devnode now taking a 'const *' device

This was a mismerge of a semantic conflict in my merge of the driver
core updates, where commit ff62b8e6 ("driver core: make struct
class.devnode() take a const *") changed the devnode function pointer
type.  In the meantime, the drm tree I merged earlier had introduced a
new use of that in commit 8bf48897 ("drivers/accel: define kconfig
and register a new major").

And of course this happens when I'm traveling with my laptop, and thus
didn't do a full allmodconfig build between every pull and before
pushing my work out.

So I only noticed later as I was doing my full build.
Brown-paper-bag-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Fixes: 71a7507a Merge tag 'driver-core-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-coreSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71a7507a
...@@ -27,7 +27,7 @@ static struct device_type accel_sysfs_device_minor = { ...@@ -27,7 +27,7 @@ static struct device_type accel_sysfs_device_minor = {
.name = "accel_minor" .name = "accel_minor"
}; };
static char *accel_devnode(struct device *dev, umode_t *mode) static char *accel_devnode(const struct device *dev, umode_t *mode)
{ {
return kasprintf(GFP_KERNEL, "accel/%s", dev_name(dev)); return kasprintf(GFP_KERNEL, "accel/%s", dev_name(dev));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment