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-- | 1.1 KB |
Makefile | -rw-r--r-- | 206 bytes |
bitmap.c | -rw-r--r-- | 6.7 KB |
dir.c | -rw-r--r-- | 10.9 KB |
file.c | -rw-r--r-- | 1.2 KB |
inode.c | -rw-r--r-- | 19.0 KB |
itree_common.c | -rw-r--r-- | 7.8 KB |
itree_v1.c | -rw-r--r-- | 1.3 KB |
itree_v2.c | -rw-r--r-- | 1.7 KB |
minix.h | -rw-r--r-- | 5.2 KB |
namei.c | -rw-r--r-- | 5.6 KB |
Computing file changes ...