treewide: Fix Marek's name and change my e-mail address

Fix diacritics in some instances of my name and change my e-mail address
to kabel@kernel.org.

Add corresponding .mailmap entries.

Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/.mailmap b/.mailmap
index 3910e056f0def18e973ef602c0a90523a4156b36..f27f366bcb50e24e92e6ea1a069cf21c4c92f2a4 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -37,6 +37,8 @@ Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
 Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
 Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
 Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
+Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
+Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
 Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
 Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
 Marek Vasut <marex@denx.de> <marex at denx.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 63ae53caa0d01cb3b8fb7eda24c9b0c546d67456..59f790470506c93620304e7480a2eaebbc3b49ee 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -751,7 +751,7 @@ F:  net/eth_bootdevice.c
 F:     test/boot/
 
 BTRFS
-M:     Marek Behun <marek.behun@nic.cz>
+M:     Marek Behún <kabel@kernel.org>
 R:     Qu Wenruo <wqu@suse.com>
 L:     linux-btrfs@vger.kernel.org
 S:     Maintained
@@ -955,7 +955,7 @@ F:  drivers/i2c/
 
 KWBIMAGE / KWBOOT TOOLS
 M:     Pali Rohár <pali@kernel.org>
-M:     Marek Behún <marek.behun@nic.cz>
+M:     Marek Behún <kabel@kernel.org>
 M:     Stefan Roese <sr@denx.de>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-marvell.git

diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index 64ebe2c6d47b2cf5972d98f68a67ce111949b1b5..5a22cc64a1a5e70ef5ee490fbef49e66940985e9 100644 (file)
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2017 Marek Behún <kabel@kernel.org>
  */
 
 / {

diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 52b5109b735ce6d5db61226acf2508eb3ee7e4bf..ab72b304e5daaedd829cee80e2a1b34aef53f597 100644 (file)
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Stefan Roese <sr@denx.de>
- * Copyright (C) 2020 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2020 Marek Behún <kabel@kernel.org>
  */
 
 #include <common.h>

diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c
index eb1f82845f0f0fc585a7eb49b40c3edc16c00a90..6555b8673ce0648d72efadb6291aa53b7a2bf9b2 100644 (file)
--- a/arch/arm/mach-mvebu/armada3700/mbox.c
+++ b/arch/arm/mach-mvebu/armada3700/mbox.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  * Copyright (C) 2021 Pali Rohár <pali@kernel.org>
  */
 

diff --git a/arch/arm/mach-mvebu/include/mach/mbox.h b/arch/arm/mach-mvebu/include/mach/mbox.h
index f1cb55f2bfe7e00e4016bc88e2acd3a175226248..fcc7a46c1da159578cf5acb750d46a0d04fa2b38 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/mbox.h
+++ b/arch/arm/mach-mvebu/include/mach/mbox.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  * Copyright (C) 2021 Pali Rohár <pali@kernel.org>
  */
 

diff --git a/board/CZ.NIC/turris_atsha_otp.c b/board/CZ.NIC/turris_atsha_otp.c
index e62b7ee2a49a0f5d1d618b6bd0b3246615b8e160..aa4e29b1560e445a5bfa7ef50b69e141093573aa 100644 (file)
--- a/board/CZ.NIC/turris_atsha_otp.c
+++ b/board/CZ.NIC/turris_atsha_otp.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2017 Marek Behún <kabel@kernel.org>
  * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz>
  */
 

diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS
index 3c3e477f30faa6c9d83d7232736f4de1516c6001..b29ce92ccd77d9714fdbf4113ae7af588a863518 100644 (file)
--- a/board/CZ.NIC/turris_mox/MAINTAINERS
+++ b/board/CZ.NIC/turris_mox/MAINTAINERS
@@ -1,5 +1,5 @@
 TURRIS MOX BOARD
-M:     Marek Behún <marek.behun@nic.cz>
+M:     Marek Behún <kabel@kernel.org>
 M:     Pali Rohár <pali@kernel.org>
 S:     Maintained
 F:     arch/arm/dts/armada-3720-turris-mox*.dts*

diff --git a/board/CZ.NIC/turris_mox/Makefile b/board/CZ.NIC/turris_mox/Makefile
index 33a52b63d711744a4325727d3d9975a34003f8af..2196821b814baac1158272d1fef9612b8e1c017d 100644 (file)
--- a/board/CZ.NIC/turris_mox/Makefile
+++ b/board/CZ.NIC/turris_mox/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+# Copyright (C) 2018 Marek Behún <kabel@kernel.org>
 
 obj-y  := turris_mox.o mox_sp.o

diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index 93e96b014fca51403746528aa192fd1412f0173f..87f67512fbad751e9f684039260edb998c660a93 100644 (file)
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  */
 
 #include <common.h>

diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h
index 49a4ed80ea61bd4a5aec8eacdea39f81bd5f1059..83b6037458546f0d8647ea59c0255692fe3c967f 100644 (file)
--- a/board/CZ.NIC/turris_mox/mox_sp.h
+++ b/board/CZ.NIC/turris_mox/mox_sp.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  */
 
 #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 68bc315a9c129eaab0dc1bc6baadde96a3e53ec8..28259e71405f64baa0e8d27aaaf4aae0dada1844 100644 (file)
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  */
 
 #include <common.h>

diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS
index f653c4af86c91634143d2d37ad1e5f6de7044f2e..8258f4fc5b23d964dc6885c1c91d556f4835bd45 100644 (file)
--- a/board/CZ.NIC/turris_omnia/MAINTAINERS
+++ b/board/CZ.NIC/turris_omnia/MAINTAINERS
@@ -1,5 +1,5 @@
 TURRIS OMNIA BOARD
-M:     Marek Behún <marek.behun@nic.cz>
+M:     Marek Behún <kabel@kernel.org>
 M:     Pali Rohár <pali@kernel.org>
 S:     Maintained
 F:     arch/arm/dts/armada-385-turris-omnia*.dts*

diff --git a/board/CZ.NIC/turris_omnia/Makefile b/board/CZ.NIC/turris_omnia/Makefile
index b79555ab4673e49f008953effd381a43fb066bcf..dc39b44ae193e5e82df2d64dfbd99ccda57bbf8f 100644 (file)
--- a/board/CZ.NIC/turris_omnia/Makefile
+++ b/board/CZ.NIC/turris_omnia/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
+# Copyright (C) 2017 Marek Behún <kabel@kernel.org>
 
 obj-y  := turris_omnia.o ../turris_atsha_otp.o

diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index b169abca0956a4ce2e43438943ba130b7e6da1fc..5921769f1e1df003b9ee5d34ee0207be3f8e3ec0 100644 (file)
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2017 Marek Behún <kabel@kernel.org>
  * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz>
  *
  * Derived from the code for

diff --git a/cmd/btrfs.c b/cmd/btrfs.c
index 7e3cbe12cea95c5322ae5e8d6fe58e1093fed2ec..98daea99e9edd1ac2bf28b560ef6a39fd38185ee 100644 (file)
--- a/cmd/btrfs.c
+++ b/cmd/btrfs.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * 2017 by Marek Behun <marek.behun@nic.cz>
+ * 2017 by Marek Behún <kabel@kernel.org>
  */
 
 #include <common.h>

diff --git a/doc/kwboot.1 b/doc/kwboot.1
index d663bf1f7753ae57d0b82c89d616eb9ad6e5f246..0863d197fd499107989c6090a0843f4a808da79b 100644 (file)
--- a/doc/kwboot.1
+++ b/doc/kwboot.1
@@ -194,4 +194,4 @@ David Purdy <david.c.purdy@gmail.com>
 .br
 Pali Rohár <pali@kernel.org>
 .br
-Marek Behún <marek.behun@nic.cz>
+Marek Behún <kabel@kernel.org>

diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 3b767d7060093ab660c3946b5897398b745f3037..e75052f383c6f0288f9bc54bd452bb148f346001 100644 (file)
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Peripheral clocks
  *
- * Marek Behun <marek.behun@nic.cz>
+ * Marek Behún <kabel@kernel.org>
  *
  * Based on Linux driver by:
  *   Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c
index 054aff5e6aca16a907e4c31762733e3a29b615ab..846a73cd6b3610978c7dfe447c236ee12b9c1d61 100644 (file)
--- a/drivers/clk/mvebu/armada-37xx-tbg.c
+++ b/drivers/clk/mvebu/armada-37xx-tbg.c
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Time Base Generator clocks
  *
- * Marek Behun <marek.behun@nic.cz>
+ * Marek Behún <kabel@kernel.org>
  *
  * Based on Linux driver by:
  *   Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 81ecb5b6177ba33e4381fb00975b1173bcf5a666..e7c6be593dc1dfaec86b39d3829b17fcc5a88872 100644 (file)
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com
  *              2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
- *              2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ *              2017 Marek Behún, CZ.NIC, kabel@kernel.org
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as

diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c
index 2af64e39122460c308d05b1dd9b73a1f99b5e66a..d0fe5dd7a8a6dbeffb27691e0141212a5453bdc4 100644 (file)
--- a/drivers/rtc/armada38x.c
+++ b/drivers/rtc/armada38x.c
@@ -2,7 +2,7 @@
 /*
  * RTC driver for the Armada 38x Marvell SoCs
  *
- * Copyright (C) 2021 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2021 Marek Behún <kabel@kernel.org>
  *
  * Based on Linux' driver by Gregory Clement and Marvell
  */

diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
index bacebbc7926a76567c0e2dfc23cda9e5ca5d214a..e09f5ac9e34ee3f60ba574f83e4cca4a2c1f4aee 100644 (file)
--- a/drivers/watchdog/armada-37xx-wdt.c
+++ b/drivers/watchdog/armada-37xx-wdt.c
@@ -2,7 +2,7 @@
 /*
  * Marvell Armada 37xx SoC Watchdog Driver
  *
- * Marek Behun <marek.behun@nic.cz>
+ * Marek Behún <kabel@kernel.org>
  */
 
 #include <common.h>

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index c30ed8221740739281e149b3f64731118d6972d0..127766df58af33dcd1e4ad2ffd6f3b5347e175bb 100644 (file)
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -5,7 +5,7 @@
  *
  * Authors:    Tomas Hlavacek <tmshlvck@gmail.com>
  *             Sylver Bruneau <sylver.bruneau@googlemail.com>
- *             Marek Behun <marek.behun@nic.cz>
+ *             Marek Behún <kabel@kernel.org>
  *
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index fc074c84d281919a7aa5828a5514c4814df0563e..31b426d572a9fb0d08d76351d483f5564f82eccb 100644 (file)
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+# 2017 Marek Behún, CZ.NIC, kabel@kernel.org
 
 obj-y := btrfs.o compression.o ctree.o dev.o dir-item.o \
        extent-io.o inode.o subvolume.o crypto/hash.o disk-io.o \

diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 741c6e20f533cbe23a9256353c14d76ac19c284b..4cdbbbe3d06697aea9f09f524f2e5bb2f3f28d76 100644 (file)
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <config.h>

diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h
index a52587e0637a7800c81a3148a0a81d40bd1bd9d7..2bc2f0fd6d37ba2ebe2b9ad9647fb2fafffddc1c 100644 (file)
--- a/fs/btrfs/btrfs.h
+++ b/fs/btrfs/btrfs.h
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #ifndef __BTRFS_BTRFS_H__

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 7adfbb04a7ce7dfdc3d6e179acec1af581194396..c69524d38eccd066429153e4adb149a3b49e34d3 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include "btrfs.h"

diff --git a/fs/btrfs/conv-funcs.h b/fs/btrfs/conv-funcs.h
index 30791cd628ff6e2ec5c38908ef44ae6e1c58d91a..0a7af9dc873b6d58e60c64346c727cc6942214ad 100644 (file)
--- a/fs/btrfs/conv-funcs.h
+++ b/fs/btrfs/conv-funcs.h
@@ -2,7 +2,7 @@
 /*
  * Functions to convert BTRFS structures from disk to CPU endianness and back.
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #ifndef __BTRFS_CONV_FUNCS_H__

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 5ffced91606f076c03a8fc33a011514a96e25148..8e932adc425d316966d8ece8a53502c9c84946ec 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <linux/kernel.h>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 55112318a330c9a35854b96a3df79129b42bc061..ffd095ffdd2e71a1bfbeb2949ea23a1d9665f79d 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3,7 +3,7 @@
  * From linux/fs/btrfs/ctree.h
  *   Copyright (C) 2007,2008 Oracle.  All rights reserved.
  *
- * Modified in 2017 by Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * Modified in 2017 by Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #ifndef __BTRFS_CTREE_H__

diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c
index 1e5b83235ad5f8674857fc2ec8e76149355b1620..cb3b9713a5f4d1b7c209e7b75d740f7296ac1daa 100644 (file)
--- a/fs/btrfs/dev.c
+++ b/fs/btrfs/dev.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <common.h>

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index aab197a6d55a718780706bea01fe041aa511b84e..5f81d6414f06a0d2bed1b885bf869d354924cb58 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include "btrfs.h"

diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c
index 774e29eb602b90a0b58a131ee3e6617b2c2a6306..f4d56a084b96c13879ff33066fab919da2e482cf 100644 (file)
--- a/fs/btrfs/extent-io.c
+++ b/fs/btrfs/extent-io.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <linux/kernel.h>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0173d30cd8ab392712221d00bbb1bad76bd50122..40025662f250a32e051db424194ed23eea441a3a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <linux/kernel.h>

diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c
index 2815673bcd62cf5720ff0c86db73b1972d11e8c4..d446e7a2c418cfc90b5537304709a234fb4a566c 100644 (file)
--- a/fs/btrfs/subvolume.c
+++ b/fs/btrfs/subvolume.c
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #include <malloc.h>

diff --git a/fs/fs_internal.c b/fs/fs_internal.c
index bfc35c996c83888848b5d9bc978913343a69e19a..ae1cb8584c743a92a1c020c73f8688dd1bdd0b7a 100644 (file)
--- a/fs/fs_internal.c
+++ b/fs/fs_internal.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * 2017 by Marek Behun <marek.behun@nic.cz>
+ * 2017 by Marek Behún <kabel@kernel.org>
  *
  * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
  */

diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 39fc0e9ca7259ac5f9b4dcc1a1fe6c8c6382527e..c35f5992e2f37dcbc74bd2ed951998d94975863b 100644 (file)
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com
  *              2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
- *              2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ *              2017 Marek Behún, CZ.NIC, kabel@kernel.org
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as

diff --git a/include/btrfs.h b/include/btrfs.h
index a7605e15897039c059e29d8fdd26551a33daa959..2d73add18e09a971253fac5208c77c55e9ce72a7 100644 (file)
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -2,7 +2,7 @@
 /*
  * BTRFS filesystem implementation for U-Boot
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #ifndef __U_BOOT_BTRFS_H__

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 401627a47a2f83971026694066602dba11a71a83..b8ff705ac923d2248df0884b0c652c5f2fd93a6c 100644 (file)
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  *
  * Based on mvebu_armada-37xx.h by Stefan Roese <sr@denx.de>
  */

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 9013d9a6932589463be989e081bf129ac49b781d..52de4cdc78939fb3bf2c3c3ec8e78d2c044117f2 100644 (file)
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2017 Marek Behún <kabel@kernel.org>
  * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz>
  */
 

diff --git a/include/fs_internal.h b/include/fs_internal.h
index 3d4d25da960ecc82911b30e8473a9497e3c6ac16..07f6bc5ea402b172bf09af8f9e37d53498064d98 100644 (file)
--- a/include/fs_internal.h
+++ b/include/fs_internal.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * 2017 by Marek Behun <marek.behun@nic.cz>
+ * 2017 by Marek Behún <kabel@kernel.org>
  *
  * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
  */

diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h
index cb815d0fee6cee8afd2ce8c72f42774181d3ed34..c5fa1b80e38ae721ea191e1461355ec510920643 100644 (file)
--- a/include/u-boot/variadic-macro.h
+++ b/include/u-boot/variadic-macro.h
@@ -2,7 +2,7 @@
 /*
  * Helper for work with variadic macros
  *
- * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org
  */
 
 #ifndef __VARIADIC_MACRO_H__

diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh
index b8840dd011351ca0ca6946f0426e495c8bd0c3a2..d0864804aafba12454bf1241d5cbcdb94d0b05a4 100755 (executable)
--- a/scripts/gen_ll_addressable_symbols.sh
+++ b/scripts/gen_ll_addressable_symbols.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0+
-# Copyright (C) 2020 Marek Behún <marek.behun@nic.cz>
+# Copyright (C) 2020 Marek Behún <kabel@kernel.org>
 
 # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO
 # does not optimize these symbols away

diff --git a/tools/kwboot.c b/tools/kwboot.c
index b697d3b60e6a165b614ad6e17d2134f5517a1b1a..16bcd4d9a778762137ff8bf71e0d701ea1811291 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -5,7 +5,7 @@
  *
  * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com>
  * (c) 2021 Pali Rohár <pali@kernel.org>
- * (c) 2021 Marek Behún <marek.behun@nic.cz>
+ * (c) 2021 Marek Behún <kabel@kernel.org>
  *
  * References:
  * - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional

diff --git a/tools/termios_linux.h b/tools/termios_linux.h
index e100c8e4eb5f4729a15fca95f6942cfbd66631c4..45f5c1233c017139f3cd4bffab0e7e0314e24b4f 100644 (file)
--- a/tools/termios_linux.h
+++ b/tools/termios_linux.h
@@ -3,7 +3,7 @@
  * termios fuctions to support arbitrary baudrates (on Linux)
  *
  * Copyright (c) 2021 Pali Rohár <pali@kernel.org>
- * Copyright (c) 2021 Marek Behún <marek.behun@nic.cz>
+ * Copyright (c) 2021 Marek Behún <kabel@kernel.org>
  */
 
 #ifndef _TERMIOS_LINUX_H_