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 |
---|---|---|
cluster | ||
dlm | ||
dlmfs | ||
Kconfig | -rw-r--r-- | 2.5 KB |
Makefile | -rw-r--r-- | 1.0 KB |
acl.c | -rw-r--r-- | 9.2 KB |
acl.h | -rw-r--r-- | 753 bytes |
alloc.c | -rw-r--r-- | 195.7 KB |
alloc.h | -rw-r--r-- | 11.1 KB |
aops.c | -rw-r--r-- | 61.7 KB |
aops.h | -rw-r--r-- | 2.3 KB |
blockcheck.c | -rw-r--r-- | 15.2 KB |
blockcheck.h | -rw-r--r-- | 3.2 KB |
buffer_head_io.c | -rw-r--r-- | 11.1 KB |
buffer_head_io.h | -rw-r--r-- | 1.6 KB |
dcache.c | -rw-r--r-- | 12.4 KB |
dcache.h | -rw-r--r-- | 1.1 KB |
dir.c | -rw-r--r-- | 113.2 KB |
dir.h | -rw-r--r-- | 3.1 KB |
dlmglue.c | -rw-r--r-- | 125.6 KB |
dlmglue.h | -rw-r--r-- | 6.7 KB |
export.c | -rw-r--r-- | 6.1 KB |
export.h | -rw-r--r-- | 316 bytes |
extent_map.c | -rw-r--r-- | 23.4 KB |
extent_map.h | -rw-r--r-- | 2.2 KB |
file.c | -rw-r--r-- | 68.6 KB |
file.h | -rw-r--r-- | 2.3 KB |
filecheck.c | -rw-r--r-- | 11.9 KB |
filecheck.h | -rw-r--r-- | 1.8 KB |
heartbeat.c | -rw-r--r-- | 2.7 KB |
heartbeat.h | -rw-r--r-- | 752 bytes |
inode.c | -rw-r--r-- | 45.4 KB |
inode.h | -rw-r--r-- | 5.3 KB |
ioctl.c | -rw-r--r-- | 22.1 KB |
ioctl.h | -rw-r--r-- | 549 bytes |
journal.c | -rw-r--r-- | 61.7 KB |
journal.h | -rw-r--r-- | 21.5 KB |
localalloc.c | -rw-r--r-- | 33.3 KB |
localalloc.h | -rw-r--r-- | 1.4 KB |
locks.c | -rw-r--r-- | 2.6 KB |
locks.h | -rw-r--r-- | 395 bytes |
mmap.c | -rw-r--r-- | 4.3 KB |
mmap.h | -rw-r--r-- | 173 bytes |
move_extents.c | -rw-r--r-- | 25.1 KB |
move_extents.h | -rw-r--r-- | 287 bytes |
namei.c | -rw-r--r-- | 69.5 KB |
namei.h | -rw-r--r-- | 1.0 KB |
ocfs1_fs_compat.h | -rw-r--r-- | 2.2 KB |
ocfs2.h | -rw-r--r-- | 24.6 KB |
ocfs2_fs.h | -rw-r--r-- | 49.5 KB |
ocfs2_ioctl.h | -rw-r--r-- | 6.3 KB |
ocfs2_lockid.h | -rw-r--r-- | 2.6 KB |
ocfs2_lockingver.h | -rw-r--r-- | 486 bytes |
ocfs2_trace.h | -rw-r--r-- | 75.8 KB |
quota.h | -rw-r--r-- | 4.6 KB |
quota_global.c | -rw-r--r-- | 29.7 KB |
quota_local.c | -rw-r--r-- | 35.6 KB |
refcounttree.c | -rw-r--r-- | 120.2 KB |
refcounttree.h | -rw-r--r-- | 4.3 KB |
reservations.c | -rw-r--r-- | 19.8 KB |
reservations.h | -rw-r--r-- | 4.8 KB |
resize.c | -rw-r--r-- | 15.5 KB |
resize.h | -rw-r--r-- | 368 bytes |
slot_map.c | -rw-r--r-- | 11.8 KB |
slot_map.h | -rw-r--r-- | 693 bytes |
stack_o2cb.c | -rw-r--r-- | 11.0 KB |
stack_user.c | -rw-r--r-- | 28.8 KB |
stackglue.c | -rw-r--r-- | 16.9 KB |
stackglue.h | -rw-r--r-- | 8.7 KB |
suballoc.c | -rw-r--r-- | 74.7 KB |
suballoc.h | -rw-r--r-- | 6.8 KB |
super.c | -rw-r--r-- | 69.2 KB |
super.h | -rw-r--r-- | 835 bytes |
symlink.c | -rw-r--r-- | 2.4 KB |
symlink.h | -rw-r--r-- | 558 bytes |
sysfile.c | -rw-r--r-- | 4.0 KB |
sysfile.h | -rw-r--r-- | 340 bytes |
uptodate.c | -rw-r--r-- | 16.9 KB |
uptodate.h | -rw-r--r-- | 2.3 KB |
xattr.c | -rw-r--r-- | 192.9 KB |
xattr.h | -rw-r--r-- | 3.0 KB |
Computing file changes ...