Commit bec9e8ac authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

skd: Switch to GPLv2 



This change does not affect any skd driver version derived from a
dual licensed code base but makes all code derived from future
upstream skd driver versions GPLv2 only.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5fbd545c

drivers/block/skd_main.c

+9 −16
Original line number Diff line number Diff line 
/* Copyright 2012 STEC, Inc.

/*

 * Driver for sTec s1120 PCIe SSDs. sTec was acquired in 2013 by HGST and HGST

 * was acquired by Western Digital in 2012.

 *

 * Copyright 2012 sTec, Inc.

 * Copyright (c) 2017 Western Digital Corporation or its affiliates.

 *

 * This file is licensed under the terms of the 3-clause

 * BSD License (http://opensource.org/licenses/BSD-3-Clause)

 * or the GNU GPL-2.0 (http://www.gnu.org/licenses/gpl-2.0.html),

 * at your option. Both licenses are also available in the LICENSE file

 * distributed with this project. This file may not be copied, modified,

 * or distributed except in accordance with those terms.

 * Gordoni Waidhofer <gwaidhofer@stec-inc.com>

 * Initial Driver Design!

 * Thomas Swann <tswann@stec-inc.com>

 * Interrupt handling.

 * Ramprasad Chinthekindi <rchinthekindi@stec-inc.com>

 * biomode implementation.

 * Akhil Bhansali <abhansali@stec-inc.com>

 * Added support for DISCARD / FLUSH and FUA.

 * This file is part of the Linux kernel, and is made available under

 * the terms of the GNU General Public License version 2.

 */



#include <linux/kernel.h>
@@ -80,7 +73,7 @@ enum { 
#define DRV_VER_COMPL   "2.2.1." DRV_BUILD_ID



MODULE_AUTHOR("bug-reports: support@stec-inc.com");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_LICENSE("GPL");



MODULE_DESCRIPTION("STEC s1120 PCIe SSD block driver (b" DRV_BUILD_ID ")");

MODULE_VERSION(DRV_VERSION "-" DRV_BUILD_ID);

drivers/block/skd_s1120.h

+5 −7
Original line number Diff line number Diff line 
/* Copyright 2012 STEC, Inc.

/*

 * Copyright 2012 STEC, Inc.

 * Copyright (c) 2017 Western Digital Corporation or its affiliates.

 *

 * This file is licensed under the terms of the 3-clause

 * BSD License (http://opensource.org/licenses/BSD-3-Clause)

 * or the GNU GPL-2.0 (http://www.gnu.org/licenses/gpl-2.0.html),

 * at your option. Both licenses are also available in the LICENSE file

 * distributed with this project. This file may not be copied, modified,

 * or distributed except in accordance with those terms.

 * This file is part of the Linux kernel, and is made available under

 * the terms of the GNU General Public License version 2.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE