Skip to content

Commit

Permalink
treewide: Fix Marek's name and change my e-mail address
Browse files Browse the repository at this point in the history
Fix diacritics in some instances of my name and change my e-mail address
to [email protected].

Add corresponding .mailmap entries.

Signed-off-by: Marek Behún <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
  • Loading branch information
elkablo authored and stroese committed Jul 21, 2022
1 parent 8a7880f commit 61143f7
Show file tree
Hide file tree
Showing 45 changed files with 47 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Jagan Teki <[email protected]>
Jernej Skrabec <[email protected]> <[email protected]>
Igor Opaniuk <[email protected]> <[email protected]>
Igor Opaniuk <[email protected]> <[email protected]>
Marek Behún <[email protected]> <[email protected]>
Marek Behún <[email protected]> Marek Behun <[email protected]>
Marek Vasut <[email protected]> <[email protected]>
Marek Vasut <[email protected]> <[email protected]>
Marek Vasut <[email protected]> <marex at denx.de>
Expand Down
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ F: net/eth_bootdevice.c
F: test/boot/

BTRFS
M: Marek Behun <[email protected]>
M: Marek Behún <[email protected]>
R: Qu Wenruo <[email protected]>
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -955,7 +955,7 @@ F: drivers/i2c/

KWBIMAGE / KWBOOT TOOLS
M: Pali Rohár <[email protected]>
M: Marek Behún <[email protected]>
M: Marek Behún <[email protected]>
M: Stefan Roese <[email protected]>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Marek Behun <[email protected]>
* Copyright (C) 2017 Marek Behún <[email protected]>
*/

/ {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mvebu/armada3700/cpu.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Stefan Roese <[email protected]>
* Copyright (C) 2020 Marek Behun <[email protected]>
* Copyright (C) 2020 Marek Behún <[email protected]>
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mvebu/armada3700/mbox.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
* Copyright (C) 2021 Pali Rohár <[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mvebu/include/mach/mbox.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
* Copyright (C) 2021 Pali Rohár <[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_atsha_otp.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Marek Behun <[email protected]>
* Copyright (C) 2017 Marek Behún <[email protected]>
* Copyright (C) 2016 Tomas Hlavacek <[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_mox/MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TURRIS MOX BOARD
M: Marek Behún <[email protected]>
M: Marek Behún <[email protected]>
M: Pali Rohár <[email protected]>
S: Maintained
F: arch/arm/dts/armada-3720-turris-mox*.dts*
Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_mox/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2018 Marek Behun <[email protected]>
# Copyright (C) 2018 Marek Behún <[email protected]>

obj-y := turris_mox.o mox_sp.o
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_mox/mox_sp.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_mox/mox_sp.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
*/

#ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_
Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_mox/turris_mox.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_omnia/MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TURRIS OMNIA BOARD
M: Marek Behún <[email protected]>
M: Marek Behún <[email protected]>
M: Pali Rohár <[email protected]>
S: Maintained
F: arch/arm/dts/armada-385-turris-omnia*.dts*
Expand Down
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_omnia/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2017 Marek Behun <[email protected]>
# Copyright (C) 2017 Marek Behún <[email protected]>

obj-y := turris_omnia.o ../turris_atsha_otp.o
2 changes: 1 addition & 1 deletion board/CZ.NIC/turris_omnia/turris_omnia.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Marek Behun <[email protected]>
* Copyright (C) 2017 Marek Behún <[email protected]>
* Copyright (C) 2016 Tomas Hlavacek <[email protected]>
*
* Derived from the code for
Expand Down
2 changes: 1 addition & 1 deletion cmd/btrfs.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* 2017 by Marek Behun <[email protected]>
* 2017 by Marek Behún <[email protected]>
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion doc/kwboot.1
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ David Purdy <[email protected]>
.br
Pali Rohár <[email protected]>
.br
Marek Behún <[email protected]>
Marek Behún <[email protected]>
2 changes: 1 addition & 1 deletion drivers/clk/mvebu/armada-37xx-periph.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Marvell Armada 37xx SoC Peripheral clocks
*
* Marek Behun <[email protected]>
* Marek Behún <[email protected]>
*
* Based on Linux driver by:
* Gregory CLEMENT <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/mvebu/armada-37xx-tbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Marvell Armada 37xx SoC Time Base Generator clocks
*
* Marek Behun <[email protected]>
* Marek Behún <[email protected]>
*
* Based on Linux driver by:
* Gregory CLEMENT <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/atsha204a-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
* 2016 Tomas Hlavacek, CZ.NIC, [email protected]
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/armada38x.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* RTC driver for the Armada 38x Marvell SoCs
*
* Copyright (C) 2021 Marek Behun <[email protected]>
* Copyright (C) 2021 Marek Behún <[email protected]>
*
* Based on Linux' driver by Gregory Clement and Marvell
*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/watchdog/armada-37xx-wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Marvell Armada 37xx SoC Watchdog Driver
*
* Marek Behun <[email protected]>
* Marek Behún <[email protected]>
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/watchdog/orion_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Authors: Tomas Hlavacek <[email protected]>
* Sylver Bruneau <[email protected]>
* Marek Behun <[email protected]>
* Marek Behún <[email protected]>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
# 2017 Marek Behun, CZ.NIC, [email protected]
# 2017 Marek Behún, CZ.NIC, [email protected]

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 \
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/btrfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <config.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/btrfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#ifndef __BTRFS_BTRFS_H__
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/compression.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include "btrfs.h"
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/conv-funcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Functions to convert BTRFS structures from disk to CPU endianness and back.
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#ifndef __BTRFS_CONV_FUNCS_H__
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/ctree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <linux/kernel.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/ctree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, [email protected]
* Modified in 2017 by Marek Behún, CZ.NIC, [email protected]
*/

#ifndef __BTRFS_CTREE_H__
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <common.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/dir-item.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include "btrfs.h"
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/extent-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <linux/kernel.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <linux/kernel.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/subvolume.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#include <malloc.h>
Expand Down
2 changes: 1 addition & 1 deletion fs/fs_internal.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* 2017 by Marek Behun <[email protected]>
* 2017 by Marek Behún <[email protected]>
*
* Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
*/
Expand Down
2 changes: 1 addition & 1 deletion include/atsha204a-i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (C) 2014 Josh Datko, Cryptotronix, [email protected]
* 2016 Tomas Hlavacek, CZ.NIC, [email protected]
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion include/btrfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#ifndef __U_BOOT_BTRFS_H__
Expand Down
2 changes: 1 addition & 1 deletion include/configs/turris_mox.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Marek Behun <[email protected]>
* Copyright (C) 2018 Marek Behún <[email protected]>
*
* Based on mvebu_armada-37xx.h by Stefan Roese <[email protected]>
*/
Expand Down
2 changes: 1 addition & 1 deletion include/configs/turris_omnia.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Marek Behun <[email protected]>
* Copyright (C) 2017 Marek Behún <[email protected]>
* Copyright (C) 2016 Tomas Hlavacek <[email protected]>
*/

Expand Down
2 changes: 1 addition & 1 deletion include/fs_internal.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* 2017 by Marek Behun <[email protected]>
* 2017 by Marek Behún <[email protected]>
*
* Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
*/
Expand Down
2 changes: 1 addition & 1 deletion include/u-boot/variadic-macro.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* Helper for work with variadic macros
*
* 2017 Marek Behun, CZ.NIC, [email protected]
* 2017 Marek Behún, CZ.NIC, [email protected]
*/

#ifndef __VARIADIC_MACRO_H__
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_ll_addressable_symbols.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0+
# Copyright (C) 2020 Marek Behún <[email protected]>
# Copyright (C) 2020 Marek Behún <[email protected]>

# Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO
# does not optimize these symbols away
Expand Down
2 changes: 1 addition & 1 deletion tools/kwboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* (c) 2012 Daniel Stodden <[email protected]>
* (c) 2021 Pali Rohár <[email protected]>
* (c) 2021 Marek Behún <[email protected]>
* (c) 2021 Marek Behún <[email protected]>
*
* References:
* - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional
Expand Down
2 changes: 1 addition & 1 deletion tools/termios_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* termios fuctions to support arbitrary baudrates (on Linux)
*
* Copyright (c) 2021 Pali Rohár <[email protected]>
* Copyright (c) 2021 Marek Behún <[email protected]>
* Copyright (c) 2021 Marek Behún <[email protected]>
*/

#ifndef _TERMIOS_LINUX_H_
Expand Down

0 comments on commit 61143f7

Please sign in to comment.