From: Linus Torvalds Date: Sun, 20 Aug 2023 06:18:58 +0000 (+0200) Subject: Merge tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux X-Git-Tag: microblaze-v6.8~725 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ec27a636d7e1aa05e64ef0b1bd848f27f8105a39;p=linux-2.6-microblaze.git Merge tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux Pull rust fix from Miguel Ojeda: - Macros: fix 'HAS_*' redefinition by the '#[vtable]' macro under conditional compilation * tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux: rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`) --- ec27a636d7e1aa05e64ef0b1bd848f27f8105a39