summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-10-13 18:10:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2024-10-13 18:10:52 +0200
commitf683c9b134f2b0cb5d917296a142db1211468a78 (patch)
tree3eaa4a63afc4de9b1674e46b4eb45a83f20ca521 /.mailmap
parentMerge tag 'powerpc-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff)
parentmailmap: update mail for Fiona Behrens (diff)
downloadlinux-f683c9b134f2b0cb5d917296a142db1211468a78.tar.xz
linux-f683c9b134f2b0cb5d917296a142db1211468a78.zip
Merge tag 'driver-core-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here is a single driver core fix, and a .mailmap update. The fix is for the rust driver core bindings, turned out that the from_raw binding wasn't a good idea (don't want to pass a pointer to a reference counted object without actually incrementing the pointer.) So this change fixes it up as the from_raw binding came in in -rc1. The other change is a .mailmap update. Both have been in linux-next for a while with no reported issues" * tag 'driver-core-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: mailmap: update mail for Fiona Behrens rust: device: change the from_raw() function
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 3faaa5f400c6..54580db9c59b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -210,6 +210,9 @@ Felix Moeller <felix@derklecks.de>
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
Filipe Lautert <filipe@icewall.org>
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
+Fiona Behrens <me@kloenk.dev>
+Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
+Fiona Behrens <me@kloenk.dev> <fin@nyantec.com>
Franck Bui-Huu <vagabon.xyz@gmail.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>