# git rev-parse -q --verify e7ed343658792771cf1b868df061661b7bcc5cef^{commit} e7ed343658792771cf1b868df061661b7bcc5cef already have revision, skipping fetch # git checkout -q -f -B kisskb e7ed343658792771cf1b868df061661b7bcc5cef # git clean -qxdf # < git log -1 # commit e7ed343658792771cf1b868df061661b7bcc5cef # Merge: 907537f570c6 54595f2807d2 # Author: Linus Torvalds # Date: Sun Sep 29 09:53:04 2024 -0700 # # Merge tag 'mailbox-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox # # Pull mailbox updates from Jassi Brar: # # - fix kconfig dependencies (mhu-v3, omap2+) # # - use devie name instead of genereic imx_mu_chan as interrupt name # (imx) # # - enable sa8255p and qcs8300 ipc controllers (qcom) # # - Fix timeout during suspend mode (bcm2835) # # - convert to use use of_property_match_string (mailbox) # # - enable mt8188 (mediatek) # # - use devm_clk_get_enabled helpers (spreadtrum) # # - fix device-id typo (rockchip) # # * tag 'mailbox-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox: # mailbox, remoteproc: omap2+: fix compile testing # dt-bindings: mailbox: qcom-ipcc: Document QCS8300 IPCC # dt-bindings: mailbox: qcom-ipcc: document the support for SA8255p # dt-bindings: mailbox: mtk,adsp-mbox: Add compatible for MT8188 # mailbox: Use of_property_match_string() instead of open-coding # mailbox: bcm2835: Fix timeout during suspend mode # mailbox: sprd: Use devm_clk_get_enabled() helpers # mailbox: rockchip: fix a typo in module autoloading # mailbox: imx: use device name in interrupt name # mailbox: ARM_MHU_V3 should depend on ARM64 # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 e7ed343658792771cf1b868df061661b7bcc5cef # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig 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] # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.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] # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- 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] 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] 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: /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_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() | ^~~~~~~~~~~ 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 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_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_background.o] Error 1 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/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/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() | ^~~~~~~~~~~ /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 make[5]: *** [/kisskb/src/scripts/Makefile.build:229: fs/bcachefs/alloc_foreground.o] Error 1 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 /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 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_m68k-gcc13 # Build took: 0:08:02.041861