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.2 KB
Makefile -rw-r--r-- 283 bytes
alloc.c -rw-r--r-- 24.2 KB
alloc.h -rw-r--r-- 3.2 KB
bmap.c -rw-r--r-- 14.4 KB
bmap.h -rw-r--r-- 7.8 KB
btnode.c -rw-r--r-- 6.6 KB
btnode.h -rw-r--r-- 1.4 KB
btree.c -rw-r--r-- 62.4 KB
btree.h -rw-r--r-- 2.0 KB
cpfile.c -rw-r--r-- 25.4 KB
cpfile.h -rw-r--r-- 1.1 KB
dat.c -rw-r--r-- 12.7 KB
dat.h -rw-r--r-- 1.7 KB
dir.c -rw-r--r-- 16.6 KB
direct.c -rw-r--r-- 8.7 KB
direct.h -rw-r--r-- 645 bytes
export.h -rw-r--r-- 505 bytes
file.c -rw-r--r-- 3.7 KB
gcinode.c -rw-r--r-- 5.1 KB
ifile.c -rw-r--r-- 5.2 KB
ifile.h -rw-r--r-- 1.1 KB
inode.c -rw-r--r-- 28.6 KB
ioctl.c -rw-r--r-- 35.2 KB
mdt.c -rw-r--r-- 15.6 KB
mdt.h -rw-r--r-- 3.7 KB
namei.c -rw-r--r-- 12.6 KB
nilfs.h -rw-r--r-- 12.5 KB
page.c -rw-r--r-- 13.6 KB
page.h -rw-r--r-- 1.9 KB
recovery.c -rw-r--r-- 23.5 KB
segbuf.c -rw-r--r-- 12.9 KB
segbuf.h -rw-r--r-- 5.5 KB
segment.c -rw-r--r-- 73.8 KB
segment.h -rw-r--r-- 7.8 KB
sufile.c -rw-r--r-- 31.5 KB
sufile.h -rw-r--r-- 4.2 KB
super.c -rw-r--r-- 34.9 KB
sysfs.c -rw-r--r-- 30.9 KB
sysfs.h -rw-r--r-- 5.2 KB
the_nilfs.c -rw-r--r-- 20.2 KB
the_nilfs.h -rw-r--r-- 11.3 KB

back to top