# git rev-parse -q --verify 4b058c9f281f5b100efbf665dd5a1a05e1654d6d^{commit} # git fetch -q -n -f https://github.com/linuxppc/linux fixes-test # git rev-parse -q --verify 4b058c9f281f5b100efbf665dd5a1a05e1654d6d^{commit} 4b058c9f281f5b100efbf665dd5a1a05e1654d6d # git checkout -q -f -B kisskb 4b058c9f281f5b100efbf665dd5a1a05e1654d6d # git clean -qxdf # < git log -1 # commit 4b058c9f281f5b100efbf665dd5a1a05e1654d6d # Author: Jason A. Donenfeld # Date: Wed Sep 25 19:50:22 2024 +0200 # # powerpc/vdso: allow r30 in vDSO code generation of getrandom # # For gettimeofday, -ffixed-r30 was passed to work around a bug in Go # code, where the vDSO trampoline forgot to save and restore this register # across function calls. But Go requires a different trampoline for every # call, and there's no reason that new Go code needs to be broken and add # more bugs. So remove -ffixed-r30 for getrandom. # # Fixes: 8072b39c3a75 ("powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO64") # Signed-off-by: Jason A. Donenfeld # Signed-off-by: Michael Ellerman # Link: https://msgid.link/20240925175021.1526936-2-Jason@zx2c4.com # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 4b058c9f281f5b100efbf665dd5a1a05e1654d6d # make -s -j 40 ARCH=m68k O=/kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- defconfig WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # < make -s -j 40 ARCH=m68k O=/kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 40 ARCH=m68k O=/kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # make -s -j 40 ARCH=m68k O=/kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/fs/bcachefs/bset.h:9, from /kisskb/src/fs/bcachefs/btree_iter.h:5, from /kisskb/src/fs/bcachefs/str_hash.h:5, from /kisskb/src/fs/bcachefs/xattr.h:5, from /kisskb/src/fs/bcachefs/acl.c:6: /kisskb/src/fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ In file included from /kisskb/src/fs/bcachefs/bset.h:10, from /kisskb/src/fs/bcachefs/btree_iter.h:5, from /kisskb/src/fs/bcachefs/str_hash.h:5, from /kisskb/src/fs/bcachefs/xattr.h:5, from /kisskb/src/fs/bcachefs/acl.c:6: /kisskb/src/fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable': /kisskb/src/fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version In file included from /kisskb/src/fs/bcachefs/extents.h:6, from /kisskb/src/fs/bcachefs/buckets.h:12, from /kisskb/src/fs/bcachefs/alloc_background.h:7, from /kisskb/src/fs/bcachefs/alloc_foreground.c:15: /kisskb/src/fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ In file included from /kisskb/src/fs/bcachefs/extents.h:6, from /kisskb/src/fs/bcachefs/buckets.h:12, from /kisskb/src/fs/bcachefs/alloc_background.h:7, from /kisskb/src/fs/bcachefs/alloc_background.c:3: /kisskb/src/fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/acl.o] Error 1 make[5]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/fs/bcachefs/btree_cache.h:7, from /kisskb/src/fs/bcachefs/backpointers.h:5, from /kisskb/src/fs/bcachefs/alloc_foreground.c:17: /kisskb/src/fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable': /kisskb/src/fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version In file included from /kisskb/src/fs/bcachefs/btree_cache.h:7, from /kisskb/src/fs/bcachefs/backpointers.h:5, from /kisskb/src/fs/bcachefs/alloc_background.c:5: /kisskb/src/fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable': /kisskb/src/fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version In file included from /kisskb/src/fs/bcachefs/btree_write_buffer.h:6, from /kisskb/src/fs/bcachefs/alloc_background.c:13: /kisskb/src/fs/bcachefs/disk_accounting.h: In function 'bch2_accounting_accumulate': /kisskb/src/fs/bcachefs/disk_accounting.h:39:33: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0) | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:39:50: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0) | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:40:24: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 40 | dst->k.bversion = src.k->bversion; | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:40:42: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 40 | dst->k.bversion = src.k->bversion; | ^~~~~~~~ | version make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/alloc_foreground.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/alloc_background.o] Error 1 In file included from /kisskb/src/fs/bcachefs/bkey_methods.h:5, from /kisskb/src/fs/bcachefs/bbpos.h:6, from /kisskb/src/fs/bcachefs/backpointers.c:3: /kisskb/src/fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ In file included from /kisskb/src/fs/bcachefs/bbpos.h:6, from /kisskb/src/fs/bcachefs/backpointers.c:3: /kisskb/src/fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable': /kisskb/src/fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version In file included from /kisskb/src/fs/bcachefs/bkey.c:4: /kisskb/src/fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x' 578 | #define x(id, field) __bkey_format_add(s, id, k->field); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields' 579 | bkey_fields() | ^~~~~~~~~~~ In file included from /kisskb/src/fs/bcachefs/bkey.c:6: /kisskb/src/fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable': /kisskb/src/fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 73 | !bversion_cmp(l->bversion, r->bversion) && | ^~~~~~~~ | version In file included from /kisskb/src/fs/bcachefs/bcachefs.h:207, from /kisskb/src/fs/bcachefs/bkey.c:3: /kisskb/src/fs/bcachefs/bkey.c: At top level: /kisskb/src/fs/bcachefs/bcachefs_format.h:331:49: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 331 | bkey_format_field(VERSION_HI, bversion.hi), \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bcachefs_format.h:320:63: note: in definition of macro 'bkey_format_field' 320 | [BKEY_FIELD_##name] = (sizeof(((struct bkey *) NULL)->field) * 8) | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:10:53: note: in expansion of macro 'BKEY_FORMAT_CURRENT' 10 | const struct bkey_format bch2_bkey_format_current = BKEY_FORMAT_CURRENT; | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/bcachefs/bcachefs_format.h:332:49: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 332 | bkey_format_field(VERSION_LO, bversion.lo), \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bcachefs_format.h:320:63: note: in definition of macro 'bkey_format_field' 320 | [BKEY_FIELD_##name] = (sizeof(((struct bkey *) NULL)->field) * 8) | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:10:53: note: in expansion of macro 'BKEY_FORMAT_CURRENT' 10 | const struct bkey_format bch2_bkey_format_current = BKEY_FORMAT_CURRENT; | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c: In function '__bch2_bkey_unpack_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c:283:29: note: in definition of macro 'x' 283 | #define x(id, field) out.field = get_inc_field(&state, id); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:284:9: note: in expansion of macro 'bkey_fields' 284 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c:283:29: note: in definition of macro 'x' 283 | #define x(id, field) out.field = get_inc_field(&state, id); | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:284:9: note: in expansion of macro 'bkey_fields' 284 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c: In function 'bch2_bkey_pack_key': /kisskb/src/fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \ | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c:329:60: note: in definition of macro 'x' 329 | #define x(id, field) if (!set_inc_field(&state, id, in->field)) return false; | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:330:9: note: in expansion of macro 'bkey_fields' 330 | bkey_fields() | ^~~~~~~~~~~ /kisskb/src/fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 558 | x(BKEY_FIELD_VERSION_LO, bversion.lo) | ^~~~~~~~ /kisskb/src/fs/bcachefs/bkey.c:329:60: note: in definition of macro 'x' 329 | #define x(id, field) if (!set_inc_field(&state, id, in->field)) return false; | ^~~~~ /kisskb/src/fs/bcachefs/bkey.c:330:9: note: in expansion of macro 'bkey_fields' 330 | bkey_fields() | ^~~~~~~~~~~ In file included from /kisskb/src/fs/bcachefs/btree_write_buffer.h:6, from /kisskb/src/fs/bcachefs/backpointers.c:10: /kisskb/src/fs/bcachefs/disk_accounting.h: In function 'bch2_accounting_accumulate': /kisskb/src/fs/bcachefs/disk_accounting.h:39:33: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0) | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:39:50: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0) | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:40:24: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'? 40 | dst->k.bversion = src.k->bversion; | ^~~~~~~~ | version /kisskb/src/fs/bcachefs/disk_accounting.h:40:42: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 40 | dst->k.bversion = src.k->bversion; | ^~~~~~~~ | version make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/bkey.o] Error 1 /kisskb/src/fs/bcachefs/backpointers.c: In function 'check_extent_checksum': /kisskb/src/fs/bcachefs/backpointers.c:504:53: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'? 504 | struct nonce nonce = extent_nonce(extent.k->bversion, p.crc); | ^~~~~~~~ | version make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/backpointers.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:478: fs/bcachefs] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:478: fs] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1936: .] Error 2 make[1]: *** [/kisskb/src/Makefile:224: __sub-make] Error 2 make: *** [Makefile:224: __sub-make] Error 2 Command 'make -s -j 40 ARCH=m68k O=/kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/powerpc-fixes_defconfig_m68k-gcc11 # Build took: 0:01:01.092857