Revision ac8a6eba2a117e0fdc04da62ab568d1b7ca4c8f6 authored by Linus Torvalds on 25 October 2021, 17:46:41 UTC, committed by Linus Torvalds on 25 October 2021, 17:46:41 UTC
Commit efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n") already
fixed the build without PM support once.  There was an alternative fix
by Guenter in commit 2bab94090b01 ("spi: tegra20-slink: Declare runtime
suspend and resume functions conditionally"), and Mark then merged the
two correctly in ffb1e76f4f32 ("Merge tag 'v5.15-rc2' into spi-5.15").

But for some inexplicable reason, Mark then merged things _again_ in
commit 59c4e190b10c ("Merge tag 'v5.15-rc3' into spi-5.15"), and screwed
things up at that point, and the __maybe_unused attribute on
tegra_slink_runtime_resume() went missing.

Reinstate it, so that alpha (and other architectures without PM support)
builds cleanly again.

Btw, this is another prime example of how random back-merges are not
good.  Just don't do them.  Subsystem developers should not merge my
tree in any normal circumstances.  Both of those merge commits pointed
to above are bad: even the one that got the merge result right doesn't
even mention _why_ it was done, and the one that got it wrong is
obviously broken.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent c2b4385
History
File Mode Size
Kconfig -rw-r--r-- 1.4 KB
Makefile -rw-r--r-- 343 bytes
acl.c -rw-r--r-- 3.2 KB
acl.h -rw-r--r-- 639 bytes
aops.c -rw-r--r-- 20.3 KB
aops.h -rw-r--r-- 374 bytes
bmap.c -rw-r--r-- 65.7 KB
bmap.h -rw-r--r-- 2.3 KB
dentry.c -rw-r--r-- 2.3 KB
dir.c -rw-r--r-- 52.3 KB
dir.h -rw-r--r-- 2.5 KB
export.c -rw-r--r-- 4.6 KB
file.c -rw-r--r-- 34.9 KB
gfs2.h -rw-r--r-- 372 bytes
glock.c -rw-r--r-- 65.3 KB
glock.h -rw-r--r-- 10.0 KB
glops.c -rw-r--r-- 21.3 KB
glops.h -rw-r--r-- 1.0 KB
incore.h -rw-r--r-- 23.5 KB
inode.c -rw-r--r-- 51.7 KB
inode.h -rw-r--r-- 4.0 KB
lock_dlm.c -rw-r--r-- 40.5 KB
log.c -rw-r--r-- 36.9 KB
log.h -rw-r--r-- 3.0 KB
lops.c -rw-r--r-- 28.4 KB
lops.h -rw-r--r-- 2.4 KB
main.c -rw-r--r-- 6.2 KB
meta_io.c -rw-r--r-- 12.7 KB
meta_io.h -rw-r--r-- 2.4 KB
ops_fstype.c -rw-r--r-- 44.0 KB
quota.c -rw-r--r-- 42.5 KB
quota.h -rw-r--r-- 2.0 KB
recovery.c -rw-r--r-- 14.9 KB
recovery.h -rw-r--r-- 1.1 KB
rgrp.c -rw-r--r-- 73.2 KB
rgrp.h -rw-r--r-- 3.4 KB
super.c -rw-r--r-- 37.2 KB
super.h -rw-r--r-- 2.2 KB
sys.c -rw-r--r-- 20.1 KB
sys.h -rw-r--r-- 507 bytes
trace_gfs2.h -rw-r--r-- 17.8 KB
trans.c -rw-r--r-- 9.2 KB
trans.h -rw-r--r-- 1.6 KB
util.c -rw-r--r-- 15.7 KB
util.h -rw-r--r-- 6.4 KB
xattr.c -rw-r--r-- 32.8 KB
xattr.h -rw-r--r-- 1.9 KB

back to top