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-- 4.3 KB
Makefile -rw-r--r-- 487 bytes
acl.c -rw-r--r-- 9.5 KB
acl.h -rw-r--r-- 1.1 KB
checkpoint.c -rw-r--r-- 46.8 KB
compress.c -rw-r--r-- 45.6 KB
data.c -rw-r--r-- 101.4 KB
debug.c -rw-r--r-- 22.7 KB
dir.c -rw-r--r-- 28.4 KB
extent_cache.c -rw-r--r-- 21.7 KB
f2fs.h -rw-r--r-- 141.1 KB
file.c -rw-r--r-- 106.6 KB
gc.c -rw-r--r-- 51.6 KB
gc.h -rw-r--r-- 4.9 KB
hash.c -rw-r--r-- 3.0 KB
inline.c -rw-r--r-- 18.7 KB
inode.c -rw-r--r-- 25.1 KB
iostat.c -rw-r--r-- 7.5 KB
iostat.h -rw-r--r-- 2.6 KB
namei.c -rw-r--r-- 31.8 KB
node.c -rw-r--r-- 80.7 KB
node.h -rw-r--r-- 12.0 KB
recovery.c -rw-r--r-- 21.0 KB
segment.c -rw-r--r-- 137.6 KB
segment.h -rw-r--r-- 27.7 KB
shrinker.c -rw-r--r-- 3.1 KB
super.c -rw-r--r-- 119.3 KB
sysfs.c -rw-r--r-- 34.6 KB
verity.c -rw-r--r-- 8.1 KB
xattr.c -rw-r--r-- 19.9 KB
xattr.h -rw-r--r-- 5.2 KB

back to top