Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+35 -36
+1 -2
Documentation/scsi/osd.txt
··· 184 184 More up-to-date information can be found on: 185 185 http://open-osd.org 186 186 187 - Boaz Harrosh <bharrosh@panasas.com> 188 - Benny Halevy <bhalevy@panasas.com> 187 + Boaz Harrosh <ooo@electrozaur.com> 189 188 190 189 References 191 190 ==========
+1 -1
MAINTAINERS
··· 6830 6830 F: drivers/net/wireless/orinoco/ 6831 6831 6832 6832 OSD LIBRARY and FILESYSTEM 6833 - M: Boaz Harrosh <bharrosh@panasas.com> 6833 + M: Boaz Harrosh <ooo@electrozaur.com> 6834 6834 M: Benny Halevy <bhalevy@primarydata.com> 6835 6835 L: osd-dev@open-osd.org 6836 6836 W: http://open-osd.org
+1 -1
drivers/scsi/osd/Kbuild
··· 4 4 # Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 # 6 6 # Authors: 7 - # Boaz Harrosh <bharrosh@panasas.com> 7 + # Boaz Harrosh <ooo@electrozaur.com> 8 8 # Benny Halevy <bhalevy@panasas.com> 9 9 # 10 10 # This program is free software; you can redistribute it and/or modify
+1 -1
drivers/scsi/osd/Kconfig
··· 4 4 # Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 # 6 6 # Authors: 7 - # Boaz Harrosh <bharrosh@panasas.com> 7 + # Boaz Harrosh <ooo@electrozaur.com> 8 8 # Benny Halevy <bhalevy@panasas.com> 9 9 # 10 10 # This program is free software; you can redistribute it and/or modify
+1 -1
drivers/scsi/osd/osd_debug.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify
+2 -2
drivers/scsi/osd/osd_initiator.c
··· 7 7 * Copyright (C) 2008 Panasas Inc. All rights reserved. 8 8 * 9 9 * Authors: 10 - * Boaz Harrosh <bharrosh@panasas.com> 10 + * Boaz Harrosh <ooo@electrozaur.com> 11 11 * Benny Halevy <bhalevy@panasas.com> 12 12 * 13 13 * This program is free software; you can redistribute it and/or modify ··· 57 57 58 58 enum { OSD_REQ_RETRIES = 1 }; 59 59 60 - MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); 60 + MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>"); 61 61 MODULE_DESCRIPTION("open-osd initiator library libosd.ko"); 62 62 MODULE_LICENSE("GPL"); 63 63
+2 -2
drivers/scsi/osd/osd_uld.c
··· 10 10 * Copyright (C) 2008 Panasas Inc. All rights reserved. 11 11 * 12 12 * Authors: 13 - * Boaz Harrosh <bharrosh@panasas.com> 13 + * Boaz Harrosh <ooo@electrozaur.com> 14 14 * Benny Halevy <bhalevy@panasas.com> 15 15 * 16 16 * This program is free software; you can redistribute it and/or modify ··· 74 74 static const char osd_name[] = "osd"; 75 75 static const char *osd_version_string = "open-osd 0.2.1"; 76 76 77 - MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); 77 + MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>"); 78 78 MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko"); 79 79 MODULE_LICENSE("GPL"); 80 80 MODULE_ALIAS_CHARDEV_MAJOR(SCSI_OSD_MAJOR);
+1 -1
fs/exofs/Kbuild
··· 4 4 # Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 # 6 6 # Authors: 7 - # Boaz Harrosh <bharrosh@panasas.com> 7 + # Boaz Harrosh <ooo@electrozaur.com> 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify 10 10 # it under the terms of the GNU General Public License version 2
+1 -1
fs/exofs/common.h
··· 4 4 * Copyright (C) 2005, 2006 5 5 * Avishay Traeger (avishay@gmail.com) 6 6 * Copyright (C) 2008, 2009 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * 9 9 * Copyrights for code taken from ext2: 10 10 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/dir.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/exofs.h
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/file.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/inode.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/namei.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+2 -2
fs/exofs/ore.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * This file is part of exofs. 8 8 * ··· 29 29 30 30 #include "ore_raid.h" 31 31 32 - MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); 32 + MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>"); 33 33 MODULE_DESCRIPTION("Objects Raid Engine ore.ko"); 34 34 MODULE_LICENSE("GPL"); 35 35
+1 -1
fs/exofs/ore_raid.c
··· 1 1 /* 2 2 * Copyright (C) 2011 3 - * Boaz Harrosh <bharrosh@panasas.com> 3 + * Boaz Harrosh <ooo@electrozaur.com> 4 4 * 5 5 * This file is part of the objects raid engine (ore). 6 6 *
+1 -1
fs/exofs/ore_raid.h
··· 1 1 /* 2 2 * Copyright (C) from 2011 3 - * Boaz Harrosh <bharrosh@panasas.com> 3 + * Boaz Harrosh <ooo@electrozaur.com> 4 4 * 5 5 * This file is part of the objects raid engine (ore). 6 6 *
+1 -1
fs/exofs/super.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/symlink.c
··· 2 2 * Copyright (C) 2005, 2006 3 3 * Avishay Traeger (avishay@gmail.com) 4 4 * Copyright (C) 2008, 2009 5 - * Boaz Harrosh <bharrosh@panasas.com> 5 + * Boaz Harrosh <ooo@electrozaur.com> 6 6 * 7 7 * Copyrights for code taken from ext2: 8 8 * Copyright (C) 1992, 1993, 1994, 1995
+1 -1
fs/exofs/sys.c
··· 1 1 /* 2 2 * Copyright (C) 2012 3 3 * Sachin Bhamare <sbhamare@panasas.com> 4 - * Boaz Harrosh <bharrosh@panasas.com> 4 + * Boaz Harrosh <ooo@electrozaur.com> 5 5 * 6 6 * This file is part of exofs. 7 7 *
+1 -1
fs/nfs/objlayout/objio_osd.c
··· 5 5 * All rights reserved. 6 6 * 7 7 * Benny Halevy <bhalevy@panasas.com> 8 - * Boaz Harrosh <bharrosh@panasas.com> 8 + * Boaz Harrosh <ooo@electrozaur.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify 11 11 * it under the terms of the GNU General Public License version 2
+1 -1
fs/nfs/objlayout/objlayout.c
··· 5 5 * All rights reserved. 6 6 * 7 7 * Benny Halevy <bhalevy@panasas.com> 8 - * Boaz Harrosh <bharrosh@panasas.com> 8 + * Boaz Harrosh <ooo@electrozaur.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify 11 11 * it under the terms of the GNU General Public License version 2
+1 -1
fs/nfs/objlayout/objlayout.h
··· 6 6 * All rights reserved. 7 7 * 8 8 * Benny Halevy <bhalevy@panasas.com> 9 - * Boaz Harrosh <bharrosh@panasas.com> 9 + * Boaz Harrosh <ooo@electrozaur.com> 10 10 * 11 11 * This program is free software; you can redistribute it and/or modify 12 12 * it under the terms of the GNU General Public License version 2
+1 -1
fs/nfs/objlayout/pnfs_osd_xdr_cli.c
··· 5 5 * All rights reserved. 6 6 * 7 7 * Benny Halevy <bhalevy@panasas.com> 8 - * Boaz Harrosh <bharrosh@panasas.com> 8 + * Boaz Harrosh <ooo@electrozaur.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify 11 11 * it under the terms of the GNU General Public License version 2
+1 -1
include/linux/pnfs_osd_xdr.h
··· 5 5 * All rights reserved. 6 6 * 7 7 * Benny Halevy <bhalevy@panasas.com> 8 - * Boaz Harrosh <bharrosh@panasas.com> 8 + * Boaz Harrosh <ooo@electrozaur.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify 11 11 * it under the terms of the GNU General Public License version 2
+1 -1
include/scsi/osd_initiator.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify
+1 -1
include/scsi/osd_ore.h
··· 1 1 /* 2 2 * Copyright (C) 2011 3 - * Boaz Harrosh <bharrosh@panasas.com> 3 + * Boaz Harrosh <ooo@electrozaur.com> 4 4 * 5 5 * Public Declarations of the ORE API 6 6 *
+2 -2
include/scsi/osd_protocol.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify ··· 496 496 */ 497 497 498 498 struct osd_key_identifier { 499 - u8 id[7]; /* if you know why 7 please email bharrosh@panasas.com */ 499 + u8 id[7]; /* if you know why 7 please email ooo@electrozaur.com */ 500 500 } __packed; 501 501 502 502 /* for osd_capability.format */
+1 -1
include/scsi/osd_sec.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify
+1 -1
include/scsi/osd_sense.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify
+1 -1
include/scsi/osd_types.h
··· 4 4 * Copyright (C) 2008 Panasas Inc. All rights reserved. 5 5 * 6 6 * Authors: 7 - * Boaz Harrosh <bharrosh@panasas.com> 7 + * Boaz Harrosh <ooo@electrozaur.com> 8 8 * Benny Halevy <bhalevy@panasas.com> 9 9 * 10 10 * This program is free software; you can redistribute it and/or modify