Commit 848a5528 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

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
parents 43d451f1 1fa3a002
...@@ -184,8 +184,7 @@ Any problems, questions, bug reports, lonely OSD nights, please email: ...@@ -184,8 +184,7 @@ Any problems, questions, bug reports, lonely OSD nights, please email:
More up-to-date information can be found on: More up-to-date information can be found on:
http://open-osd.org http://open-osd.org
Boaz Harrosh <bharrosh@panasas.com> Boaz Harrosh <ooo@electrozaur.com>
Benny Halevy <bhalevy@panasas.com>
References References
========== ==========
......
...@@ -6830,7 +6830,7 @@ S: Orphan ...@@ -6830,7 +6830,7 @@ S: Orphan
F: drivers/net/wireless/orinoco/ F: drivers/net/wireless/orinoco/
OSD LIBRARY and FILESYSTEM OSD LIBRARY and FILESYSTEM
M: Boaz Harrosh <bharrosh@panasas.com> M: Boaz Harrosh <ooo@electrozaur.com>
M: Benny Halevy <bhalevy@primarydata.com> M: Benny Halevy <bhalevy@primarydata.com>
L: osd-dev@open-osd.org L: osd-dev@open-osd.org
W: http://open-osd.org W: http://open-osd.org
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved. # Copyright (C) 2008 Panasas Inc. All rights reserved.
# #
# Authors: # Authors:
# Boaz Harrosh <bharrosh@panasas.com> # Boaz Harrosh <ooo@electrozaur.com>
# Benny Halevy <bhalevy@panasas.com> # Benny Halevy <bhalevy@panasas.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved. # Copyright (C) 2008 Panasas Inc. All rights reserved.
# #
# Authors: # Authors:
# Boaz Harrosh <bharrosh@panasas.com> # Boaz Harrosh <ooo@electrozaur.com>
# Benny Halevy <bhalevy@panasas.com> # Benny Halevy <bhalevy@panasas.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
enum { OSD_REQ_RETRIES = 1 }; 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_DESCRIPTION("open-osd initiator library libosd.ko");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
static const char osd_name[] = "osd"; static const char osd_name[] = "osd";
static const char *osd_version_string = "open-osd 0.2.1"; 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_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV_MAJOR(SCSI_OSD_MAJOR); MODULE_ALIAS_CHARDEV_MAJOR(SCSI_OSD_MAJOR);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Copyright (C) 2008 Panasas Inc. All rights reserved. # Copyright (C) 2008 Panasas Inc. All rights reserved.
# #
# Authors: # Authors:
# Boaz Harrosh <bharrosh@panasas.com> # Boaz Harrosh <ooo@electrozaur.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 # it under the terms of the GNU General Public License version 2
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This file is part of exofs. * This file is part of exofs.
* *
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "ore_raid.h" #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_DESCRIPTION("Objects Raid Engine ore.ko");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
/* /*
* Copyright (C) 2011 * Copyright (C) 2011
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This file is part of the objects raid engine (ore). * This file is part of the objects raid engine (ore).
* *
......
/* /*
* Copyright (C) from 2011 * Copyright (C) from 2011
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This file is part of the objects raid engine (ore). * This file is part of the objects raid engine (ore).
* *
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (C) 2005, 2006 * Copyright (C) 2005, 2006
* Avishay Traeger (avishay@gmail.com) * Avishay Traeger (avishay@gmail.com)
* Copyright (C) 2008, 2009 * Copyright (C) 2008, 2009
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Copyrights for code taken from ext2: * Copyrights for code taken from ext2:
* Copyright (C) 1992, 1993, 1994, 1995 * Copyright (C) 1992, 1993, 1994, 1995
......
/* /*
* Copyright (C) 2012 * Copyright (C) 2012
* Sachin Bhamare <sbhamare@panasas.com> * Sachin Bhamare <sbhamare@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This file is part of exofs. * This file is part of exofs.
* *
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* All rights reserved. * All rights reserved.
* *
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* All rights reserved. * All rights reserved.
* *
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* All rights reserved. * All rights reserved.
* *
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* All rights reserved. * All rights reserved.
* *
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* All rights reserved. * All rights reserved.
* *
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
/* /*
* Copyright (C) 2011 * Copyright (C) 2011
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* *
* Public Declarations of the ORE API * Public Declarations of the ORE API
* *
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -496,7 +496,7 @@ struct osd_timestamp { ...@@ -496,7 +496,7 @@ struct osd_timestamp {
*/ */
struct osd_key_identifier { 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; } __packed;
/* for osd_capability.format */ /* for osd_capability.format */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2008 Panasas Inc. All rights reserved. * Copyright (C) 2008 Panasas Inc. All rights reserved.
* *
* Authors: * Authors:
* Boaz Harrosh <bharrosh@panasas.com> * Boaz Harrosh <ooo@electrozaur.com>
* Benny Halevy <bhalevy@panasas.com> * Benny Halevy <bhalevy@panasas.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment