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
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 3.2 KB |
Makefile | -rw-r--r-- | 484 bytes |
auth.c | -rw-r--r-- | 13.5 KB |
budget.c | -rw-r--r-- | 23.3 KB |
commit.c | -rw-r--r-- | 19.9 KB |
compress.c | -rw-r--r-- | 6.6 KB |
crypto.c | -rw-r--r-- | 2.4 KB |
debug.c | -rw-r--r-- | 82.3 KB |
debug.h | -rw-r--r-- | 11.8 KB |
dir.c | -rw-r--r-- | 42.4 KB |
file.c | -rw-r--r-- | 46.8 KB |
find.c | -rw-r--r-- | 29.4 KB |
gc.c | -rw-r--r-- | 28.0 KB |
io.c | -rw-r--r-- | 35.5 KB |
ioctl.c | -rw-r--r-- | 6.0 KB |
journal.c | -rw-r--r-- | 52.1 KB |
key.h | -rw-r--r-- | 14.3 KB |
log.c | -rw-r--r-- | 19.2 KB |
lprops.c | -rw-r--r-- | 35.4 KB |
lpt.c | -rw-r--r-- | 61.7 KB |
lpt_commit.c | -rw-r--r-- | 50.5 KB |
master.c | -rw-r--r-- | 12.3 KB |
misc.c | -rw-r--r-- | 1.3 KB |
misc.h | -rw-r--r-- | 7.7 KB |
orphan.c | -rw-r--r-- | 26.2 KB |
recovery.c | -rw-r--r-- | 43.1 KB |
replay.c | -rw-r--r-- | 33.5 KB |
sb.c | -rw-r--r-- | 26.3 KB |
scan.c | -rw-r--r-- | 8.9 KB |
shrinker.c | -rw-r--r-- | 9.0 KB |
super.c | -rw-r--r-- | 64.3 KB |
tnc.c | -rw-r--r-- | 91.7 KB |
tnc_commit.c | -rw-r--r-- | 27.7 KB |
tnc_misc.c | -rw-r--r-- | 12.7 KB |
ubifs-media.h | -rw-r--r-- | 24.8 KB |
ubifs.h | -rw-r--r-- | 71.1 KB |
xattr.c | -rw-r--r-- | 19.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...