* [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali
@ 2022-06-01 15:17 Marek Behún
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Marek Behún @ 2022-06-01 15:17 UTC (permalink / raw)
To: Stefan Roese; +Cc: pali, u-boot, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Fix MAINTAINERS files for Turris devices, add missing files and add Pali
as maintainer.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
MAINTAINERS | 8 --------
board/CZ.NIC/turris_mox/MAINTAINERS | 4 +++-
board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 72bf94c3d1..1c7baf9412 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -235,14 +235,6 @@ F: drivers/net/cortina_ni.h
F: drivers/net/phy/ca_phy.c
F: configs/cortina_presidio-asic-pnand_defconfig
-ARM/CZ.NIC TURRIS MOX SUPPORT
-M: Marek Behun <marek.behun@nic.cz>
-S: Maintained
-F: arch/arm/dts/armada-3720-turris-mox.dts
-F: board/CZ.NIC/
-F: configs/turris_*_defconfig
-F: include/configs/turris_*.h
-
ARM FREESCALE IMX
M: Stefano Babic <sbabic@denx.de>
M: Fabio Estevam <festevam@gmail.com>
diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS
index 2b9c1132f5..3c3e477f30 100644
--- a/board/CZ.NIC/turris_mox/MAINTAINERS
+++ b/board/CZ.NIC/turris_mox/MAINTAINERS
@@ -1,6 +1,8 @@
-TURRIS OMNIA BOARD
+TURRIS MOX BOARD
M: Marek Behún <marek.behun@nic.cz>
+M: Pali Rohár <pali@kernel.org>
S: Maintained
+F: arch/arm/dts/armada-3720-turris-mox*.dts*
F: board/CZ.NIC/turris_mox/
F: include/configs/turris_mox.h
F: configs/turris_mox_defconfig
diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS
index ed15e11d3e..f653c4af86 100644
--- a/board/CZ.NIC/turris_omnia/MAINTAINERS
+++ b/board/CZ.NIC/turris_omnia/MAINTAINERS
@@ -1,6 +1,9 @@
TURRIS OMNIA BOARD
M: Marek Behún <marek.behun@nic.cz>
+M: Pali Rohár <pali@kernel.org>
S: Maintained
+F: arch/arm/dts/armada-385-turris-omnia*.dts*
+F: board/CZ.NIC/turris_atsha_otp.*
F: board/CZ.NIC/turris_omnia/
-F: include/configs/turris_omnia.h
F: configs/turris_omnia_defconfig
+F: include/configs/turris_omnia.h
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address
2022-06-01 15:17 [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Marek Behún
@ 2022-06-01 15:17 ` Marek Behún
2022-06-02 7:13 ` Stefan Roese
2022-07-21 12:26 ` Stefan Roese
2022-06-02 7:12 ` [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Stefan Roese
2022-07-21 12:25 ` Stefan Roese
2 siblings, 2 replies; 6+ messages in thread
From: Marek Behún @ 2022-06-01 15:17 UTC (permalink / raw)
To: Stefan Roese; +Cc: pali, u-boot, Marek Behún
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>
---
.mailmap | 2 ++
MAINTAINERS | 4 ++--
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
arch/arm/mach-mvebu/armada3700/cpu.c | 2 +-
arch/arm/mach-mvebu/armada3700/mbox.c | 2 +-
arch/arm/mach-mvebu/include/mach/mbox.h | 2 +-
board/CZ.NIC/turris_atsha_otp.c | 2 +-
board/CZ.NIC/turris_mox/MAINTAINERS | 2 +-
board/CZ.NIC/turris_mox/Makefile | 2 +-
board/CZ.NIC/turris_mox/mox_sp.c | 2 +-
board/CZ.NIC/turris_mox/mox_sp.h | 2 +-
board/CZ.NIC/turris_mox/turris_mox.c | 2 +-
board/CZ.NIC/turris_omnia/MAINTAINERS | 2 +-
board/CZ.NIC/turris_omnia/Makefile | 2 +-
board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +-
cmd/btrfs.c | 2 +-
doc/kwboot.1 | 2 +-
drivers/clk/mvebu/armada-37xx-periph.c | 2 +-
drivers/clk/mvebu/armada-37xx-tbg.c | 2 +-
drivers/misc/atsha204a-i2c.c | 2 +-
drivers/rtc/armada38x.c | 2 +-
drivers/watchdog/armada-37xx-wdt.c | 2 +-
drivers/watchdog/orion_wdt.c | 2 +-
fs/btrfs/Makefile | 2 +-
fs/btrfs/btrfs.c | 2 +-
fs/btrfs/btrfs.h | 2 +-
fs/btrfs/compression.c | 2 +-
fs/btrfs/conv-funcs.h | 2 +-
fs/btrfs/ctree.c | 2 +-
fs/btrfs/ctree.h | 2 +-
fs/btrfs/dev.c | 2 +-
fs/btrfs/dir-item.c | 2 +-
fs/btrfs/extent-io.c | 2 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/subvolume.c | 2 +-
fs/fs_internal.c | 2 +-
include/atsha204a-i2c.h | 2 +-
include/btrfs.h | 2 +-
include/configs/turris_mox.h | 2 +-
include/configs/turris_omnia.h | 2 +-
include/fs_internal.h | 2 +-
include/u-boot/variadic-macro.h | 2 +-
scripts/gen_ll_addressable_symbols.sh | 2 +-
tools/kwboot.c | 2 +-
tools/termios_linux.h | 2 +-
45 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/.mailmap b/.mailmap
index 3910e056f0..f27f366bcb 100644
--- 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 1c7baf9412..2dae092a87 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -727,7 +727,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
@@ -930,7 +930,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 64ebe2c6d4..5a22cc64a1 100644
--- 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 52b5109b73..ab72b304e5 100644
--- 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 eb1f82845f..6555b8673c 100644
--- 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 f1cb55f2bf..fcc7a46c1d 100644
--- 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 e62b7ee2a4..aa4e29b156 100644
--- 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 3c3e477f30..b29ce92ccd 100644
--- 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 33a52b63d7..2196821b81 100644
--- 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 93e96b014f..87f67512fb 100644
--- 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 49a4ed80ea..83b6037458 100644
--- 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 68bc315a9c..28259e7140 100644
--- 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 f653c4af86..8258f4fc5b 100644
--- 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 b79555ab46..dc39b44ae1 100644
--- 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 b169abca09..5921769f1e 100644
--- 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 7e3cbe12ce..98daea99e9 100644
--- 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 d663bf1f77..0863d197fd 100644
--- 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 3b767d7060..e75052f383 100644
--- 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 054aff5e6a..846a73cd6b 100644
--- 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 aa6acf0f9a..294b42a5fc 100644
--- 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 2af64e3912..d0fe5dd7a8 100644
--- 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 bacebbc792..e09f5ac9e3 100644
--- 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 c30ed82217..127766df58 100644
--- 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 fc074c84d2..31b426d572 100644
--- 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 741c6e20f5..4cdbbbe3d0 100644
--- 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 a52587e063..2bc2f0fd6d 100644
--- 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 7adfbb04a7..c69524d38e 100644
--- 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 30791cd628..0a7af9dc87 100644
--- 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 5ffced9160..8e932adc42 100644
--- 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 55112318a3..ffd095ffdd 100644
--- 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 1e5b83235a..cb3b9713a5 100644
--- 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 aab197a6d5..5f81d6414f 100644
--- 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 774e29eb60..f4d56a084b 100644
--- 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 d00b515333..a34edc43ed 100644
--- 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 2815673bcd..d446e7a2c4 100644
--- 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 bfc35c996c..ae1cb8584c 100644
--- 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 39fc0e9ca7..c35f5992e2 100644
--- 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 a7605e1589..2d73add18e 100644
--- 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 6640ee495d..cedd8105ae 100644
--- 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 8119340b11..62cc608a8f 100644
--- 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 3d4d25da96..07f6bc5ea4 100644
--- 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 cb815d0fee..c5fa1b80e3 100644
--- 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 b8840dd011..d0864804aa 100755
--- 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 b697d3b60e..16bcd4d9a7 100644
--- 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 e100c8e4eb..45f5c1233c 100644
--- 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_
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali
2022-06-01 15:17 [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Marek Behún
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
@ 2022-06-02 7:12 ` Stefan Roese
2022-07-21 12:25 ` Stefan Roese
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-06-02 7:12 UTC (permalink / raw)
To: Marek Behún; +Cc: pali, u-boot, Marek Behún
On 01.06.22 17:17, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Fix MAINTAINERS files for Turris devices, add missing files and add Pali
> as maintainer.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> MAINTAINERS | 8 --------
> board/CZ.NIC/turris_mox/MAINTAINERS | 4 +++-
> board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
> 3 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 72bf94c3d1..1c7baf9412 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -235,14 +235,6 @@ F: drivers/net/cortina_ni.h
> F: drivers/net/phy/ca_phy.c
> F: configs/cortina_presidio-asic-pnand_defconfig
>
> -ARM/CZ.NIC TURRIS MOX SUPPORT
> -M: Marek Behun <marek.behun@nic.cz>
> -S: Maintained
> -F: arch/arm/dts/armada-3720-turris-mox.dts
> -F: board/CZ.NIC/
> -F: configs/turris_*_defconfig
> -F: include/configs/turris_*.h
> -
> ARM FREESCALE IMX
> M: Stefano Babic <sbabic@denx.de>
> M: Fabio Estevam <festevam@gmail.com>
> diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS
> index 2b9c1132f5..3c3e477f30 100644
> --- a/board/CZ.NIC/turris_mox/MAINTAINERS
> +++ b/board/CZ.NIC/turris_mox/MAINTAINERS
> @@ -1,6 +1,8 @@
> -TURRIS OMNIA BOARD
> +TURRIS MOX BOARD
> M: Marek Behún <marek.behun@nic.cz>
> +M: Pali Rohár <pali@kernel.org>
> S: Maintained
> +F: arch/arm/dts/armada-3720-turris-mox*.dts*
> F: board/CZ.NIC/turris_mox/
> F: include/configs/turris_mox.h
> F: configs/turris_mox_defconfig
> diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS
> index ed15e11d3e..f653c4af86 100644
> --- a/board/CZ.NIC/turris_omnia/MAINTAINERS
> +++ b/board/CZ.NIC/turris_omnia/MAINTAINERS
> @@ -1,6 +1,9 @@
> TURRIS OMNIA BOARD
> M: Marek Behún <marek.behun@nic.cz>
> +M: Pali Rohár <pali@kernel.org>
> S: Maintained
> +F: arch/arm/dts/armada-385-turris-omnia*.dts*
> +F: board/CZ.NIC/turris_atsha_otp.*
> F: board/CZ.NIC/turris_omnia/
> -F: include/configs/turris_omnia.h
> F: configs/turris_omnia_defconfig
> +F: include/configs/turris_omnia.h
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
@ 2022-06-02 7:13 ` Stefan Roese
2022-07-21 12:26 ` Stefan Roese
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-06-02 7:13 UTC (permalink / raw)
To: Marek Behún; +Cc: pali, u-boot
On 01.06.22 17:17, Marek Behún wrote:
> 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>
Thanks,
Stefan
> ---
> .mailmap | 2 ++
> MAINTAINERS | 4 ++--
> arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
> arch/arm/mach-mvebu/armada3700/cpu.c | 2 +-
> arch/arm/mach-mvebu/armada3700/mbox.c | 2 +-
> arch/arm/mach-mvebu/include/mach/mbox.h | 2 +-
> board/CZ.NIC/turris_atsha_otp.c | 2 +-
> board/CZ.NIC/turris_mox/MAINTAINERS | 2 +-
> board/CZ.NIC/turris_mox/Makefile | 2 +-
> board/CZ.NIC/turris_mox/mox_sp.c | 2 +-
> board/CZ.NIC/turris_mox/mox_sp.h | 2 +-
> board/CZ.NIC/turris_mox/turris_mox.c | 2 +-
> board/CZ.NIC/turris_omnia/MAINTAINERS | 2 +-
> board/CZ.NIC/turris_omnia/Makefile | 2 +-
> board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +-
> cmd/btrfs.c | 2 +-
> doc/kwboot.1 | 2 +-
> drivers/clk/mvebu/armada-37xx-periph.c | 2 +-
> drivers/clk/mvebu/armada-37xx-tbg.c | 2 +-
> drivers/misc/atsha204a-i2c.c | 2 +-
> drivers/rtc/armada38x.c | 2 +-
> drivers/watchdog/armada-37xx-wdt.c | 2 +-
> drivers/watchdog/orion_wdt.c | 2 +-
> fs/btrfs/Makefile | 2 +-
> fs/btrfs/btrfs.c | 2 +-
> fs/btrfs/btrfs.h | 2 +-
> fs/btrfs/compression.c | 2 +-
> fs/btrfs/conv-funcs.h | 2 +-
> fs/btrfs/ctree.c | 2 +-
> fs/btrfs/ctree.h | 2 +-
> fs/btrfs/dev.c | 2 +-
> fs/btrfs/dir-item.c | 2 +-
> fs/btrfs/extent-io.c | 2 +-
> fs/btrfs/inode.c | 2 +-
> fs/btrfs/subvolume.c | 2 +-
> fs/fs_internal.c | 2 +-
> include/atsha204a-i2c.h | 2 +-
> include/btrfs.h | 2 +-
> include/configs/turris_mox.h | 2 +-
> include/configs/turris_omnia.h | 2 +-
> include/fs_internal.h | 2 +-
> include/u-boot/variadic-macro.h | 2 +-
> scripts/gen_ll_addressable_symbols.sh | 2 +-
> tools/kwboot.c | 2 +-
> tools/termios_linux.h | 2 +-
> 45 files changed, 47 insertions(+), 45 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 3910e056f0..f27f366bcb 100644
> --- 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 1c7baf9412..2dae092a87 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -727,7 +727,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
> @@ -930,7 +930,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 64ebe2c6d4..5a22cc64a1 100644
> --- 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 52b5109b73..ab72b304e5 100644
> --- 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 eb1f82845f..6555b8673c 100644
> --- 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 f1cb55f2bf..fcc7a46c1d 100644
> --- 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 e62b7ee2a4..aa4e29b156 100644
> --- 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 3c3e477f30..b29ce92ccd 100644
> --- 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 33a52b63d7..2196821b81 100644
> --- 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 93e96b014f..87f67512fb 100644
> --- 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 49a4ed80ea..83b6037458 100644
> --- 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 68bc315a9c..28259e7140 100644
> --- 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 f653c4af86..8258f4fc5b 100644
> --- 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 b79555ab46..dc39b44ae1 100644
> --- 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 b169abca09..5921769f1e 100644
> --- 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 7e3cbe12ce..98daea99e9 100644
> --- 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 d663bf1f77..0863d197fd 100644
> --- 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 3b767d7060..e75052f383 100644
> --- 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 054aff5e6a..846a73cd6b 100644
> --- 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 aa6acf0f9a..294b42a5fc 100644
> --- 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 2af64e3912..d0fe5dd7a8 100644
> --- 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 bacebbc792..e09f5ac9e3 100644
> --- 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 c30ed82217..127766df58 100644
> --- 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 fc074c84d2..31b426d572 100644
> --- 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 741c6e20f5..4cdbbbe3d0 100644
> --- 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 a52587e063..2bc2f0fd6d 100644
> --- 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 7adfbb04a7..c69524d38e 100644
> --- 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 30791cd628..0a7af9dc87 100644
> --- 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 5ffced9160..8e932adc42 100644
> --- 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 55112318a3..ffd095ffdd 100644
> --- 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 1e5b83235a..cb3b9713a5 100644
> --- 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 aab197a6d5..5f81d6414f 100644
> --- 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 774e29eb60..f4d56a084b 100644
> --- 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 d00b515333..a34edc43ed 100644
> --- 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 2815673bcd..d446e7a2c4 100644
> --- 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 bfc35c996c..ae1cb8584c 100644
> --- 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 39fc0e9ca7..c35f5992e2 100644
> --- 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 a7605e1589..2d73add18e 100644
> --- 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 6640ee495d..cedd8105ae 100644
> --- 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 8119340b11..62cc608a8f 100644
> --- 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 3d4d25da96..07f6bc5ea4 100644
> --- 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 cb815d0fee..c5fa1b80e3 100644
> --- 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 b8840dd011..d0864804aa 100755
> --- 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 b697d3b60e..16bcd4d9a7 100644
> --- 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 e100c8e4eb..45f5c1233c 100644
> --- 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_
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali
2022-06-01 15:17 [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Marek Behún
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
2022-06-02 7:12 ` [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Stefan Roese
@ 2022-07-21 12:25 ` Stefan Roese
2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-07-21 12:25 UTC (permalink / raw)
To: Marek Behún; +Cc: pali, u-boot, Marek Behún
On 01.06.22 17:17, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Fix MAINTAINERS files for Turris devices, add missing files and add Pali
> as maintainer.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> MAINTAINERS | 8 --------
> board/CZ.NIC/turris_mox/MAINTAINERS | 4 +++-
> board/CZ.NIC/turris_omnia/MAINTAINERS | 5 ++++-
> 3 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 72bf94c3d1..1c7baf9412 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -235,14 +235,6 @@ F: drivers/net/cortina_ni.h
> F: drivers/net/phy/ca_phy.c
> F: configs/cortina_presidio-asic-pnand_defconfig
>
> -ARM/CZ.NIC TURRIS MOX SUPPORT
> -M: Marek Behun <marek.behun@nic.cz>
> -S: Maintained
> -F: arch/arm/dts/armada-3720-turris-mox.dts
> -F: board/CZ.NIC/
> -F: configs/turris_*_defconfig
> -F: include/configs/turris_*.h
> -
> ARM FREESCALE IMX
> M: Stefano Babic <sbabic@denx.de>
> M: Fabio Estevam <festevam@gmail.com>
> diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS
> index 2b9c1132f5..3c3e477f30 100644
> --- a/board/CZ.NIC/turris_mox/MAINTAINERS
> +++ b/board/CZ.NIC/turris_mox/MAINTAINERS
> @@ -1,6 +1,8 @@
> -TURRIS OMNIA BOARD
> +TURRIS MOX BOARD
> M: Marek Behún <marek.behun@nic.cz>
> +M: Pali Rohár <pali@kernel.org>
> S: Maintained
> +F: arch/arm/dts/armada-3720-turris-mox*.dts*
> F: board/CZ.NIC/turris_mox/
> F: include/configs/turris_mox.h
> F: configs/turris_mox_defconfig
> diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS
> index ed15e11d3e..f653c4af86 100644
> --- a/board/CZ.NIC/turris_omnia/MAINTAINERS
> +++ b/board/CZ.NIC/turris_omnia/MAINTAINERS
> @@ -1,6 +1,9 @@
> TURRIS OMNIA BOARD
> M: Marek Behún <marek.behun@nic.cz>
> +M: Pali Rohár <pali@kernel.org>
> S: Maintained
> +F: arch/arm/dts/armada-385-turris-omnia*.dts*
> +F: board/CZ.NIC/turris_atsha_otp.*
> F: board/CZ.NIC/turris_omnia/
> -F: include/configs/turris_omnia.h
> F: configs/turris_omnia_defconfig
> +F: include/configs/turris_omnia.h
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
2022-06-02 7:13 ` Stefan Roese
@ 2022-07-21 12:26 ` Stefan Roese
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-07-21 12:26 UTC (permalink / raw)
To: Marek Behún; +Cc: pali, u-boot
On 01.06.22 17:17, Marek Behún wrote:
> 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>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> .mailmap | 2 ++
> MAINTAINERS | 4 ++--
> arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +-
> arch/arm/mach-mvebu/armada3700/cpu.c | 2 +-
> arch/arm/mach-mvebu/armada3700/mbox.c | 2 +-
> arch/arm/mach-mvebu/include/mach/mbox.h | 2 +-
> board/CZ.NIC/turris_atsha_otp.c | 2 +-
> board/CZ.NIC/turris_mox/MAINTAINERS | 2 +-
> board/CZ.NIC/turris_mox/Makefile | 2 +-
> board/CZ.NIC/turris_mox/mox_sp.c | 2 +-
> board/CZ.NIC/turris_mox/mox_sp.h | 2 +-
> board/CZ.NIC/turris_mox/turris_mox.c | 2 +-
> board/CZ.NIC/turris_omnia/MAINTAINERS | 2 +-
> board/CZ.NIC/turris_omnia/Makefile | 2 +-
> board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +-
> cmd/btrfs.c | 2 +-
> doc/kwboot.1 | 2 +-
> drivers/clk/mvebu/armada-37xx-periph.c | 2 +-
> drivers/clk/mvebu/armada-37xx-tbg.c | 2 +-
> drivers/misc/atsha204a-i2c.c | 2 +-
> drivers/rtc/armada38x.c | 2 +-
> drivers/watchdog/armada-37xx-wdt.c | 2 +-
> drivers/watchdog/orion_wdt.c | 2 +-
> fs/btrfs/Makefile | 2 +-
> fs/btrfs/btrfs.c | 2 +-
> fs/btrfs/btrfs.h | 2 +-
> fs/btrfs/compression.c | 2 +-
> fs/btrfs/conv-funcs.h | 2 +-
> fs/btrfs/ctree.c | 2 +-
> fs/btrfs/ctree.h | 2 +-
> fs/btrfs/dev.c | 2 +-
> fs/btrfs/dir-item.c | 2 +-
> fs/btrfs/extent-io.c | 2 +-
> fs/btrfs/inode.c | 2 +-
> fs/btrfs/subvolume.c | 2 +-
> fs/fs_internal.c | 2 +-
> include/atsha204a-i2c.h | 2 +-
> include/btrfs.h | 2 +-
> include/configs/turris_mox.h | 2 +-
> include/configs/turris_omnia.h | 2 +-
> include/fs_internal.h | 2 +-
> include/u-boot/variadic-macro.h | 2 +-
> scripts/gen_ll_addressable_symbols.sh | 2 +-
> tools/kwboot.c | 2 +-
> tools/termios_linux.h | 2 +-
> 45 files changed, 47 insertions(+), 45 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 3910e056f0..f27f366bcb 100644
> --- 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 1c7baf9412..2dae092a87 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -727,7 +727,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
> @@ -930,7 +930,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 64ebe2c6d4..5a22cc64a1 100644
> --- 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 52b5109b73..ab72b304e5 100644
> --- 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 eb1f82845f..6555b8673c 100644
> --- 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 f1cb55f2bf..fcc7a46c1d 100644
> --- 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 e62b7ee2a4..aa4e29b156 100644
> --- 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 3c3e477f30..b29ce92ccd 100644
> --- 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 33a52b63d7..2196821b81 100644
> --- 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 93e96b014f..87f67512fb 100644
> --- 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 49a4ed80ea..83b6037458 100644
> --- 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 68bc315a9c..28259e7140 100644
> --- 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 f653c4af86..8258f4fc5b 100644
> --- 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 b79555ab46..dc39b44ae1 100644
> --- 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 b169abca09..5921769f1e 100644
> --- 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 7e3cbe12ce..98daea99e9 100644
> --- 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 d663bf1f77..0863d197fd 100644
> --- 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 3b767d7060..e75052f383 100644
> --- 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 054aff5e6a..846a73cd6b 100644
> --- 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 aa6acf0f9a..294b42a5fc 100644
> --- 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 2af64e3912..d0fe5dd7a8 100644
> --- 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 bacebbc792..e09f5ac9e3 100644
> --- 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 c30ed82217..127766df58 100644
> --- 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 fc074c84d2..31b426d572 100644
> --- 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 741c6e20f5..4cdbbbe3d0 100644
> --- 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 a52587e063..2bc2f0fd6d 100644
> --- 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 7adfbb04a7..c69524d38e 100644
> --- 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 30791cd628..0a7af9dc87 100644
> --- 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 5ffced9160..8e932adc42 100644
> --- 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 55112318a3..ffd095ffdd 100644
> --- 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 1e5b83235a..cb3b9713a5 100644
> --- 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 aab197a6d5..5f81d6414f 100644
> --- 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 774e29eb60..f4d56a084b 100644
> --- 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 d00b515333..a34edc43ed 100644
> --- 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 2815673bcd..d446e7a2c4 100644
> --- 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 bfc35c996c..ae1cb8584c 100644
> --- 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 39fc0e9ca7..c35f5992e2 100644
> --- 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 a7605e1589..2d73add18e 100644
> --- 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 6640ee495d..cedd8105ae 100644
> --- 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 8119340b11..62cc608a8f 100644
> --- 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 3d4d25da96..07f6bc5ea4 100644
> --- 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 cb815d0fee..c5fa1b80e3 100644
> --- 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 b8840dd011..d0864804aa 100755
> --- 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 b697d3b60e..16bcd4d9a7 100644
> --- 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 e100c8e4eb..45f5c1233c 100644
> --- 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_
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-07-21 12:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-01 15:17 [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Marek Behún
2022-06-01 15:17 ` [PATCH u-boot-marvell 2/2] treewide: Fix Marek's name and change my e-mail address Marek Behún
2022-06-02 7:13 ` Stefan Roese
2022-07-21 12:26 ` Stefan Roese
2022-06-02 7:12 ` [PATCH u-boot-marvell 1/2] board: turris: Fix MAINTAINERS and add Pali Stefan Roese
2022-07-21 12:25 ` Stefan Roese
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox