* [PATCH 1/2] MAINTAINERS: fix my identity again
@ 2021-06-16 11:36 Marek Behún
2021-06-16 11:36 ` [PATCH 2/2] mailmap: add my other e-mail address and identity without diacritics Marek Behún
0 siblings, 1 reply; 2+ messages in thread
From: Marek Behún @ 2021-06-16 11:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Marek Behún
Fix my name to use diacritics, since MAINTAINERS supports it.
Fix my e-mail address in MAINTAINERS' marvell10g PHY driver description,
I accidentaly put my other e-mail address here.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
MAINTAINERS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index bc0ceef87b73..bf98b44710ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1816,7 +1816,7 @@ F: drivers/pinctrl/pinctrl-gemini.c
F: drivers/rtc/rtc-ftrtc010.c
ARM/CZ.NIC TURRIS SUPPORT
-M: Marek Behun <kabel@kernel.org>
+M: Marek Behún <kabel@kernel.org>
S: Maintained
W: https://www.turris.cz/
F: Documentation/ABI/testing/debugfs-moxtet
@@ -10946,7 +10946,7 @@ F: include/linux/mv643xx.h
MARVELL MV88X3310 PHY DRIVER
M: Russell King <linux@armlinux.org.uk>
-M: Marek Behun <marek.behun@nic.cz>
+M: Marek Behún <kabel@kernel.org>
L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/phy/marvell10g.c
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] mailmap: add my other e-mail address and identity without diacritics
2021-06-16 11:36 [PATCH 1/2] MAINTAINERS: fix my identity again Marek Behún
@ 2021-06-16 11:36 ` Marek Behún
0 siblings, 0 replies; 2+ messages in thread
From: Marek Behún @ 2021-06-16 11:36 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Marek Behún
Some of my commits were sent with identities
Marek Behun <marek.behun@nic.cz>
Marek Behún <marek.behun@nic.cz>
while the correct one is
Marek Behún <kabel@kernel.org>
Put this into mailmap so that git shortlog prints all my commits under
one identity.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
.mailmap | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.mailmap b/.mailmap
index c79a78766c07..db58eedb44f1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -212,6 +212,8 @@ Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
+Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
+Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
Mark Brown <broonie@sirena.org.uk>
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-16 11:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-16 11:36 [PATCH 1/2] MAINTAINERS: fix my identity again Marek Behún
2021-06-16 11:36 ` [PATCH 2/2] mailmap: add my other e-mail address and identity without diacritics Marek Behún
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox