projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e6c269 3fa7187)
Merge tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Aug 2023 06:18:58 +0000 (08:18 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Aug 2023 06:18:58 +0000 (08:18 +0200)
commitec27a636d7e1aa05e64ef0b1bd848f27f8105a39
treedea0963ed682384586edcccc887af0a2c231bed4tree | snapshot
parent9e6c269de404bef2fb50b9407e988083a0805e3bcommit | diff
parent3fa7187eceee11998f756481e45ce8c4f9d9dc48commit | diff
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`)
Linux Project Source (from git://github.com/torvalds/linux)