diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-16 13:04:15 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-16 13:04:15 -0600 |
| commit | dcde56bb37a9f900c11eec56b0ecaca5653cc829 (patch) | |
| tree | e5cbe71798f2d4b52e85a092d0a2b40e34573c47 /tools/perf/builtin-mem.c | |
| parent | 71a7507afbc3f27c346898f13ab9bfd918613c34 (diff) | |
| download | linux-dcde56bb37a9f900c11eec56b0ecaca5653cc829.tar.bz2 | |
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 ff62b8e6588f ("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 8bf4889762a8 ("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: 71a7507afbc3 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>
Diffstat (limited to 'tools/perf/builtin-mem.c')
0 files changed, 0 insertions, 0 deletions