Skip to content
Commit dcde56bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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-core


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71a7507a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment