Linus Torvalds dcde56bb37 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 ff62b8e658 ("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 8bf4889762 ("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: Linus Torvalds <torvalds@linux-foundation.org> Fixes: 71a7507afb Merge tag 'driver-core-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2022-12-16 13:04:15 -06:00
..
drm_accel.c	Fix mismerge due to devnode now taking a 'const *' device	2022-12-16 13:04:15 -06:00
Kconfig	drivers/accel: define kconfig and register a new major	2022-11-22 13:13:51 +02:00