diff mbox series

[v2,3/3] scsi: target: Change nab@linux-iscsi.org into nab@kernel.org

Message ID 20230920200232.3721784-4-bvanassche@acm.org (mailing list archive)
State New, archived
Headers show
Series Replace most references to linux-iscsi.org | expand

Commit Message

Bart Van Assche Sept. 20, 2023, 8 p.m. UTC
Nicholas A. Bellinger owns both email addresses. Perform this
replacement because the linux-iscsi.org domain name no longer has any MX
records associated. This patch has been generated by running the
following shell command:

    git grep -li 'nab@linux-iscsi.org' |
        while read f; do
	    awk '{ if (match($0, "Copyright") == 0) gsub("nab@[lL]inux-i[sS][cC][sS][iI].org", "nab@kernel.org"); print $0 }' <$f >/tmp/awk.tmp &&
	        mv /tmp/awk.tmp $f
	done

Note: I received the following reply after having sent an email to
nab@kernel.org: "I'm sorry to have to inform you that your message
could not be delivered to one or more recipients. It's attached below.
For further assistance, please send mail to postmaster. If you do so,
please include this problem report. You can delete your own text from
the attached returned message. The mail system."

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 Documentation/target/tcm_mod_builder.rst          | 2 +-
 drivers/infiniband/ulp/isert/ib_isert.c           | 4 ++--
 drivers/target/iscsi/iscsi_target.c               | 4 ++--
 drivers/target/iscsi/iscsi_target_auth.c          | 2 +-
 drivers/target/iscsi/iscsi_target_configfs.c      | 2 +-
 drivers/target/iscsi/iscsi_target_datain_values.c | 2 +-
 drivers/target/iscsi/iscsi_target_device.c        | 2 +-
 drivers/target/iscsi/iscsi_target_erl0.c          | 2 +-
 drivers/target/iscsi/iscsi_target_erl1.c          | 2 +-
 drivers/target/iscsi/iscsi_target_erl2.c          | 2 +-
 drivers/target/iscsi/iscsi_target_login.c         | 2 +-
 drivers/target/iscsi/iscsi_target_nego.c          | 2 +-
 drivers/target/iscsi/iscsi_target_nodeattrib.c    | 2 +-
 drivers/target/iscsi/iscsi_target_parameters.c    | 2 +-
 drivers/target/iscsi/iscsi_target_seq_pdu_list.c  | 2 +-
 drivers/target/iscsi/iscsi_target_stat.c          | 2 +-
 drivers/target/iscsi/iscsi_target_tmr.c           | 2 +-
 drivers/target/iscsi/iscsi_target_tpg.c           | 2 +-
 drivers/target/iscsi/iscsi_target_util.c          | 2 +-
 drivers/target/target_core_configfs.c             | 2 +-
 drivers/target/target_core_fabric_configfs.c      | 2 +-
 drivers/target/target_core_fabric_lib.c           | 2 +-
 drivers/target/target_core_file.c                 | 2 +-
 drivers/target/target_core_iblock.c               | 2 +-
 drivers/target/target_core_pscsi.c                | 2 +-
 drivers/target/target_core_stat.c                 | 2 +-
 26 files changed, 28 insertions(+), 28 deletions(-)

Comments

Leon Romanovsky Sept. 21, 2023, 6:49 a.m. UTC | #1
On Wed, Sep 20, 2023 at 01:00:21PM -0700, Bart Van Assche wrote:
> Nicholas A. Bellinger owns both email addresses. Perform this
> replacement because the linux-iscsi.org domain name no longer has any MX
> records associated. This patch has been generated by running the
> following shell command:
> 
>     git grep -li 'nab@linux-iscsi.org' |
>         while read f; do
> 	    awk '{ if (match($0, "Copyright") == 0) gsub("nab@[lL]inux-i[sS][cC][sS][iI].org", "nab@kernel.org"); print $0 }' <$f >/tmp/awk.tmp &&
> 	        mv /tmp/awk.tmp $f
> 	done
> 
> Note: I received the following reply after having sent an email to
> nab@kernel.org: "I'm sorry to have to inform you that your message

Shouldn't it be nab@linux-iscsi.org?

> could not be delivered to one or more recipients. It's attached below.
> For further assistance, please send mail to postmaster. If you do so,
> please include this problem report. You can delete your own text from
> the attached returned message. The mail system."
> 
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
>  Documentation/target/tcm_mod_builder.rst          | 2 +-
>  drivers/infiniband/ulp/isert/ib_isert.c           | 4 ++--
>  drivers/target/iscsi/iscsi_target.c               | 4 ++--
>  drivers/target/iscsi/iscsi_target_auth.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_configfs.c      | 2 +-
>  drivers/target/iscsi/iscsi_target_datain_values.c | 2 +-
>  drivers/target/iscsi/iscsi_target_device.c        | 2 +-
>  drivers/target/iscsi/iscsi_target_erl0.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_erl1.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_erl2.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_login.c         | 2 +-
>  drivers/target/iscsi/iscsi_target_nego.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_nodeattrib.c    | 2 +-
>  drivers/target/iscsi/iscsi_target_parameters.c    | 2 +-
>  drivers/target/iscsi/iscsi_target_seq_pdu_list.c  | 2 +-
>  drivers/target/iscsi/iscsi_target_stat.c          | 2 +-
>  drivers/target/iscsi/iscsi_target_tmr.c           | 2 +-
>  drivers/target/iscsi/iscsi_target_tpg.c           | 2 +-
>  drivers/target/iscsi/iscsi_target_util.c          | 2 +-
>  drivers/target/target_core_configfs.c             | 2 +-
>  drivers/target/target_core_fabric_configfs.c      | 2 +-
>  drivers/target/target_core_fabric_lib.c           | 2 +-
>  drivers/target/target_core_file.c                 | 2 +-
>  drivers/target/target_core_iblock.c               | 2 +-
>  drivers/target/target_core_pscsi.c                | 2 +-
>  drivers/target/target_core_stat.c                 | 2 +-
>  26 files changed, 28 insertions(+), 28 deletions(-)

IMHO you don't need all these changes and this patch will do the trick.

diff --git a/.mailmap b/.mailmap
index a0a6efe87186..f5b531b1507a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -428,6 +428,7 @@ Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
 Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
 Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
+Nicholas A. Bellinger <nab@kernel.org> <nab@linux-iscsi.org>
 Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
 Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
 Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>

Thanks
Hannes Reinecke Sept. 21, 2023, 7:31 a.m. UTC | #2
On 9/20/23 22:00, Bart Van Assche wrote:
> Nicholas A. Bellinger owns both email addresses. Perform this
> replacement because the linux-iscsi.org domain name no longer has any MX
> records associated. This patch has been generated by running the
> following shell command:
> 
>      git grep -li 'nab@linux-iscsi.org' |
>          while read f; do
> 	    awk '{ if (match($0, "Copyright") == 0) gsub("nab@[lL]inux-i[sS][cC][sS][iI].org", "nab@kernel.org"); print $0 }' <$f >/tmp/awk.tmp &&
> 	        mv /tmp/awk.tmp $f
> 	done
> 
> Note: I received the following reply after having sent an email to
> nab@kernel.org: "I'm sorry to have to inform you that your message
> could not be delivered to one or more recipients. It's attached below.
> For further assistance, please send mail to postmaster. If you do so,
> please include this problem report. You can delete your own text from
> the attached returned message. The mail system."
> 
Didn't you want to drop this patch?
The 'Author' line is a historic reference; Nic Bellinger wrote this code
using that e-mail address. This fact will not change, even if Nic is 
using a different e-mail address now.

Cheers,

Hannes
Bart Van Assche Sept. 21, 2023, 2:31 p.m. UTC | #3
On 9/20/23 23:49, Leon Romanovsky wrote:
> On Wed, Sep 20, 2023 at 01:00:21PM -0700, Bart Van Assche wrote:
>> Nicholas A. Bellinger owns both email addresses. Perform this
>> replacement because the linux-iscsi.org domain name no longer has any MX
>> records associated. This patch has been generated by running the
>> following shell command:
>>
>>      git grep -li 'nab@linux-iscsi.org' |
>>          while read f; do
>> 	    awk '{ if (match($0, "Copyright") == 0) gsub("nab@[lL]inux-i[sS][cC][sS][iI].org", "nab@kernel.org"); print $0 }' <$f >/tmp/awk.tmp &&
>> 	        mv /tmp/awk.tmp $f
>> 	done
>>
>> Note: I received the following reply after having sent an email to
>> nab@kernel.org: "I'm sorry to have to inform you that your message
> 
> Shouldn't it be nab@linux-iscsi.org?

Both e-mail addresses are non-operational. The following message 
appeared in my inbox after I tried to send an email to 
nab@linux-iscsi.org: "The recipient server did not accept our requests 
to connect. [mail.linux-iscsi.org. 67.23.28.174: timed out]". The reply 
shown above was received after I tried to send an email to nab@kernel.org.

> IMHO you don't need all these changes and this patch will do the trick.
> 
> diff --git a/.mailmap b/.mailmap
> index a0a6efe87186..f5b531b1507a 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -428,6 +428,7 @@ Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
>   Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
>   Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
>   Nguyen Anh Quynh <aquynh@gmail.com>
> +Nicholas A. Bellinger <nab@kernel.org> <nab@linux-iscsi.org>
>   Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
>   Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
>   Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>

Does anyone else prefer this approach?

Thanks,

Bart.
Bart Van Assche Sept. 21, 2023, 2:35 p.m. UTC | #4
On 9/21/23 00:31, Hannes Reinecke wrote:
> On 9/20/23 22:00, Bart Van Assche wrote:
>> Note: I received the following reply after having sent an email to
>> nab@kernel.org: "I'm sorry to have to inform you that your message
>> could not be delivered to one or more recipients. It's attached below.
>> For further assistance, please send mail to postmaster. If you do so,
>> please include this problem report. You can delete your own text from
>> the attached returned message. The mail system."
>>
> Didn't you want to drop this patch?
> The 'Author' line is a historic reference; Nic Bellinger wrote this code
> using that e-mail address. This fact will not change, even if Nic is 
> using a different e-mail address now.

The domain linux-iscsi.org won't be owned by N.A.B. forever. Hence, 
sooner or later another person may become the owner of the email address 
nab@linux-iscsi.org. I think it is much less likely that the email 
address nab@kernel.org will ever be owned by another person than 
Nicholas Bellinger since the kernel.org administrators use PGP keys to 
verify the identity of a person. Anyway, I will drop this patch.

Bart.
diff mbox series

Patch

diff --git a/Documentation/target/tcm_mod_builder.rst b/Documentation/target/tcm_mod_builder.rst
index 9bfc9822e2bd..3e3e15d36a19 100644
--- a/Documentation/target/tcm_mod_builder.rst
+++ b/Documentation/target/tcm_mod_builder.rst
@@ -146,4 +146,4 @@  Future TODO items
 
 October 5th, 2010
 
-Nicholas A. Bellinger <nab@linux-iscsi.org>
+Nicholas A. Bellinger <nab@kernel.org>
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 00a7303c8cc6..3abd958c6f20 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2013 Datera, Inc.
  *
- * Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Nicholas A. Bellinger <nab@kernel.org>
  *
  ****************************************************************************/
 
@@ -2660,7 +2660,7 @@  static void __exit isert_exit(void)
 }
 
 MODULE_DESCRIPTION("iSER-Target for mainline target infrastructure");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(isert_init);
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index b516c2893420..5b2138ff3c09 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
@@ -4846,7 +4846,7 @@  int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
 
 MODULE_DESCRIPTION("iSCSI-Target Driver for mainline target infrastructure");
 MODULE_VERSION("4.1.x");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(iscsi_target_init_module);
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
index c8a248bd11be..5363e3621ef7 100644
--- a/drivers/target/iscsi/iscsi_target_auth.c
+++ b/drivers/target/iscsi/iscsi_target_auth.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 1cff6052e820..e98b896e5a11 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -5,7 +5,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ****************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_datain_values.c b/drivers/target/iscsi/iscsi_target_datain_values.c
index 2d44781be3c6..7e81afa50144 100644
--- a/drivers/target/iscsi/iscsi_target_datain_values.c
+++ b/drivers/target/iscsi/iscsi_target_datain_values.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_device.c b/drivers/target/iscsi/iscsi_target_device.c
index b565ce3b2677..613d86c48a7e 100644
--- a/drivers/target/iscsi/iscsi_target_device.c
+++ b/drivers/target/iscsi/iscsi_target_device.c
@@ -5,7 +5,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c
index 07e9cf431edd..97f366fea0f2 100644
--- a/drivers/target/iscsi/iscsi_target_erl0.c
+++ b/drivers/target/iscsi/iscsi_target_erl0.c
@@ -5,7 +5,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index f460a66c0e7c..49acae57279c 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c
index 18e88d2ea5fd..6bee1eaa8012 100644
--- a/drivers/target/iscsi/iscsi_target_erl2.c
+++ b/drivers/target/iscsi/iscsi_target_erl2.c
@@ -5,7 +5,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 90b870f234f0..ff9a75868c12 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index fa3fb5f4e6bc..fbcaccefe4a9 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_nodeattrib.c b/drivers/target/iscsi/iscsi_target_nodeattrib.c
index d63efdefb18e..60d50da7acf1 100644
--- a/drivers/target/iscsi/iscsi_target_nodeattrib.c
+++ b/drivers/target/iscsi/iscsi_target_nodeattrib.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 5b90c22ee3dc..458ea27dd62d 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_seq_pdu_list.c b/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
index 66de2b8de463..496d46c7adc6 100644
--- a/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
+++ b/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
@@ -5,7 +5,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index 367c6468b8e1..a7dddb09ee66 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -5,7 +5,7 @@ 
  *
  * Copyright (c) 2011-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c
index afc801f255f5..7999fceec62e 100644
--- a/drivers/target/iscsi/iscsi_target_tmr.c
+++ b/drivers/target/iscsi/iscsi_target_tmr.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index f7bac98fd4fe..0c1763d99675 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 91a75a4a7cc1..81f5f898dde3 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -4,7 +4,7 @@ 
  *
  * (c) Copyright 2007-2013 Datera, Inc.
  *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Author: Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 936e5ff1b209..bcbf2573d203 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3752,7 +3752,7 @@  static void __exit target_core_exit_configfs(void)
 }
 
 MODULE_DESCRIPTION("Target_Core_Mod/ConfigFS");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(target_core_init_configfs);
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index b7c637644cd4..8867f3d53665 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -7,7 +7,7 @@ 
  *
  * (c) Copyright 2010-2013 Datera, Inc.
  *
- * Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Nicholas A. Bellinger <nab@kernel.org>
 *
  ****************************************************************************/
 
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index 6600ae44f29d..b33e7412c4b6 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -7,7 +7,7 @@ 
  *
  * (c) Copyright 2010-2013 Datera, Inc.
  *
- * Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/
 
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 4d447520bab8..c95962e0feac 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -943,7 +943,7 @@  static void __exit fileio_module_exit(void)
 }
 
 MODULE_DESCRIPTION("TCM FILEIO subsystem plugin");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(fileio_module_init);
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index a6a06a5f7483..08cac93640ce 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -1189,7 +1189,7 @@  static void __exit iblock_module_exit(void)
 }
 
 MODULE_DESCRIPTION("TCM IBLOCK subsystem plugin");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(iblock_module_init);
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 0d4f09693ef4..fe9a4253c5b9 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -1062,7 +1062,7 @@  static void __exit pscsi_module_exit(void)
 }
 
 MODULE_DESCRIPTION("TCM PSCSI subsystem plugin");
-MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_AUTHOR("nab@kernel.org");
 MODULE_LICENSE("GPL");
 
 module_init(pscsi_module_init);
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c
index c42cbde8a31b..60e485753d29 100644
--- a/drivers/target/target_core_stat.c
+++ b/drivers/target/target_core_stat.c
@@ -7,7 +7,7 @@ 
  *
  * (c) Copyright 2006-2013 Datera, Inc.
  *
- * Nicholas A. Bellinger <nab@linux-iscsi.org>
+ * Nicholas A. Bellinger <nab@kernel.org>
  *
  ******************************************************************************/