]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
projects / thirdparty / kernel / stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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`)


Trivial merge
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git