Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Browse files Browse the repository at this point in the history
Pull email address change from Boaz Harrosh.

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  Boaz Harrosh - fix email in Documentation
  Boaz Harrosh - Fix broken email address
  MAINTAINERS: Change Boaz Harrosh's email
  • Loading branch information
torvalds committed Oct 21, 2014
2 parents 43d451f + 1fa3a00 commit 848a552
Show file tree
Hide file tree
Showing 31 changed files with 35 additions and 36 deletions.
3 changes: 1 addition & 2 deletions Documentation/scsi/osd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ Any problems, questions, bug reports, lonely OSD nights, please email:
More up-to-date information can be found on:
http://open-osd.org

Boaz Harrosh <[email protected]>
Benny Halevy <[email protected]>
Boaz Harrosh <[email protected]>

References
==========
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -6830,7 +6830,7 @@ S: Orphan
F: drivers/net/wireless/orinoco/

OSD LIBRARY and FILESYSTEM
M: Boaz Harrosh <bharrosh@panasas.com>
M: Boaz Harrosh <ooo@electrozaur.com>
M: Benny Halevy <[email protected]>
L: [email protected]
W: http://open-osd.org
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/osd/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved.
#
# Authors:
# Boaz Harrosh <bharrosh@panasas.com>
# Boaz Harrosh <ooo@electrozaur.com>
# Benny Halevy <[email protected]>
#
# This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/osd/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved.
#
# Authors:
# Boaz Harrosh <bharrosh@panasas.com>
# Boaz Harrosh <ooo@electrozaur.com>
# Benny Halevy <[email protected]>
#
# This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/osd/osd_debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/osd/osd_initiator.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -57,7 +57,7 @@

enum { OSD_REQ_RETRIES = 1 };

MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>");
MODULE_DESCRIPTION("open-osd initiator library libosd.ko");
MODULE_LICENSE("GPL");

Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/osd/osd_uld.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -74,7 +74,7 @@
static const char osd_name[] = "osd";
static const char *osd_version_string = "open-osd 0.2.1";

MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>");
MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");
MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV_MAJOR(SCSI_OSD_MAJOR);
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved.
#
# Authors:
# Boaz Harrosh <bharrosh@panasas.com>
# Boaz Harrosh <ooo@electrozaur.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/exofs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
4 changes: 2 additions & 2 deletions fs/exofs/ore.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This file is part of exofs.
*
Expand All @@ -29,7 +29,7 @@

#include "ore_raid.h"

MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>");
MODULE_DESCRIPTION("Objects Raid Engine ore.ko");
MODULE_LICENSE("GPL");

Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/ore_raid.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2011
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This file is part of the objects raid engine (ore).
*
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/ore_raid.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) from 2011
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This file is part of the objects raid engine (ore).
*
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/symlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006
* Avishay Traeger ([email protected])
* Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995
Expand Down
2 changes: 1 addition & 1 deletion fs/exofs/sys.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2012
* Sachin Bhamare <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This file is part of exofs.
*
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/objlayout/objio_osd.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* All rights reserved.
*
* Benny Halevy <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/objlayout/objlayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* All rights reserved.
*
* Benny Halevy <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/objlayout/objlayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* All rights reserved.
*
* Benny Halevy <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/objlayout/pnfs_osd_xdr_cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* All rights reserved.
*
* Benny Halevy <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion include/linux/pnfs_osd_xdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* All rights reserved.
*
* Benny Halevy <[email protected]>
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/osd_initiator.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/osd_ore.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2011
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
*
* Public Declarations of the ORE API
*
Expand Down
4 changes: 2 additions & 2 deletions include/scsi/osd_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -496,7 +496,7 @@ struct osd_timestamp {
*/

struct osd_key_identifier {
u8 id[7]; /* if you know why 7 please email bharrosh@panasas.com */
u8 id[7]; /* if you know why 7 please email ooo@electrozaur.com */
} __packed;

/* for osd_capability.format */
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/osd_sec.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/osd_sense.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/osd_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved.
*
* Authors:
* Boaz Harrosh <bharrosh@panasas.com>
* Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down

0 comments on commit 848a552

Please sign in to comment.