Skip to content

Commit 8f3d17f

Browse files
author
Linus Torvalds
committed
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2 parents 4f07118 + 70d374e commit 8f3d17f

File tree

18 files changed

+422
-296
lines changed

18 files changed

+422
-296
lines changed

‎drivers/scsi/ahci.c‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
/*
22
* ahci.c - AHCI SATA support
33
*
4-
* Copyright 2004 Red Hat, Inc.
4+
* Maintained by: Jeff Garzik <[email protected]>
5+
* Please ALWAYS copy [email protected]
6+
* on emails.
57
*
6-
* The contents of this file are subject to the Open
7-
* Software License version 1.1 that can be found at
8-
* http://www.opensource.org/licenses/osl-1.1.txt and is included herein
9-
* by reference.
8+
* Copyright 2004-2005 Red Hat, Inc.
109
*
11-
* Alternatively, the contents of this file may be used under the terms
12-
* of the GNU General Public License version 2 (the "GPL") as distributed
13-
* in the kernel source COPYING file, in which case the provisions of
14-
* the GPL are applicable instead of the above. If you wish to allow
15-
* the use of your version of this file only under the terms of the
16-
* GPL and not to allow others to use your version of this file under
17-
* the OSL, indicate your decision by deleting the provisions above and
18-
* replace them with the notice and other provisions required by the GPL.
19-
* If you do not delete the provisions above, a recipient may use your
20-
* version of this file under either the OSL or the GPL.
2110
*
22-
* Version 1.0 of the AHCI specification:
11+
* This program is free software; you can redistribute it and/or modify
12+
* it under the terms of the GNU General Public License as published by
13+
* the Free Software Foundation; either version 2, or (at your option)
14+
* any later version.
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU General Public License
22+
* along with this program; see the file COPYING. If not, write to
23+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
24+
*
25+
*
26+
* libata documentation is available via 'make {ps|pdf}docs',
27+
* as Documentation/DocBook/libata.*
28+
*
29+
* AHCI hardware documentation:
2330
* http://www.intel.com/technology/serialata/pdf/rev1_0.pdf
31+
* http://www.intel.com/technology/serialata/pdf/rev1_1.pdf
2432
*
2533
*/
2634

‎drivers/scsi/ata_piix.c‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
11
/*
2-
3-
ata_piix.c - Intel PATA/SATA controllers
4-
5-
Maintained by: Jeff Garzik <[email protected]>
6-
Please ALWAYS copy [email protected]
7-
on emails.
8-
9-
10-
Copyright 2003-2004 Red Hat Inc
11-
Copyright 2003-2004 Jeff Garzik
12-
13-
14-
Copyright header from piix.c:
15-
16-
Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
17-
Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
18-
Copyright (C) 2003 Red Hat Inc <[email protected]>
19-
20-
May be copied or modified under the terms of the GNU General Public License
21-
2+
* ata_piix.c - Intel PATA/SATA controllers
3+
*
4+
* Maintained by: Jeff Garzik <[email protected]>
5+
* Please ALWAYS copy [email protected]
6+
* on emails.
7+
*
8+
*
9+
* Copyright 2003-2005 Red Hat Inc
10+
* Copyright 2003-2005 Jeff Garzik
11+
*
12+
*
13+
* Copyright header from piix.c:
14+
*
15+
* Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
16+
* Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
17+
* Copyright (C) 2003 Red Hat Inc <[email protected]>
18+
*
19+
*
20+
* This program is free software; you can redistribute it and/or modify
21+
* it under the terms of the GNU General Public License as published by
22+
* the Free Software Foundation; either version 2, or (at your option)
23+
* any later version.
24+
*
25+
* This program is distributed in the hope that it will be useful,
26+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
27+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28+
* GNU General Public License for more details.
29+
*
30+
* You should have received a copy of the GNU General Public License
31+
* along with this program; see the file COPYING. If not, write to
32+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
33+
*
34+
*
35+
* libata documentation is available via 'make {ps|pdf}docs',
36+
* as Documentation/DocBook/libata.*
37+
*
38+
* Hardware documentation available at http://developer.intel.com/
39+
*
2240
*/
2341

2442
#include <linux/kernel.h>

‎drivers/scsi/libata-core.c‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
/*
2-
libata-core.c - helper library for ATA
3-
4-
Copyright 2003-2004 Red Hat, Inc. All rights reserved.
5-
Copyright 2003-2004 Jeff Garzik
6-
7-
The contents of this file are subject to the Open
8-
Software License version 1.1 that can be found at
9-
http://www.opensource.org/licenses/osl-1.1.txt and is included herein
10-
by reference.
11-
12-
Alternatively, the contents of this file may be used under the terms
13-
of the GNU General Public License version 2 (the "GPL") as distributed
14-
in the kernel source COPYING file, in which case the provisions of
15-
the GPL are applicable instead of the above. If you wish to allow
16-
the use of your version of this file only under the terms of the
17-
GPL and not to allow others to use your version of this file under
18-
the OSL, indicate your decision by deleting the provisions above and
19-
replace them with the notice and other provisions required by the GPL.
20-
If you do not delete the provisions above, a recipient may use your
21-
version of this file under either the OSL or the GPL.
22-
2+
* libata-core.c - helper library for ATA
3+
*
4+
* Maintained by: Jeff Garzik <[email protected]>
5+
* Please ALWAYS copy [email protected]
6+
* on emails.
7+
*
8+
* Copyright 2003-2004 Red Hat, Inc. All rights reserved.
9+
* Copyright 2003-2004 Jeff Garzik
10+
*
11+
*
12+
* This program is free software; you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation; either version 2, or (at your option)
15+
* any later version.
16+
*
17+
* This program is distributed in the hope that it will be useful,
18+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
* GNU General Public License for more details.
21+
*
22+
* You should have received a copy of the GNU General Public License
23+
* along with this program; see the file COPYING. If not, write to
24+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
25+
*
26+
*
27+
* libata documentation is available via 'make {ps|pdf}docs',
28+
* as Documentation/DocBook/libata.*
29+
*
30+
* Hardware documentation available from http://www.t13.org/ and
31+
* http://www.sata-io.org/
32+
*
2333
*/
2434

2535
#include <linux/config.h>

‎drivers/scsi/libata-scsi.c‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
11
/*
2-
libata-scsi.c - helper library for ATA
3-
4-
Copyright 2003-2004 Red Hat, Inc. All rights reserved.
5-
Copyright 2003-2004 Jeff Garzik
6-
7-
The contents of this file are subject to the Open
8-
Software License version 1.1 that can be found at
9-
http://www.opensource.org/licenses/osl-1.1.txt and is included herein
10-
by reference.
11-
12-
Alternatively, the contents of this file may be used under the terms
13-
of the GNU General Public License version 2 (the "GPL") as distributed
14-
in the kernel source COPYING file, in which case the provisions of
15-
the GPL are applicable instead of the above. If you wish to allow
16-
the use of your version of this file only under the terms of the
17-
GPL and not to allow others to use your version of this file under
18-
the OSL, indicate your decision by deleting the provisions above and
19-
replace them with the notice and other provisions required by the GPL.
20-
If you do not delete the provisions above, a recipient may use your
21-
version of this file under either the OSL or the GPL.
22-
2+
* libata-scsi.c - helper library for ATA
3+
*
4+
* Maintained by: Jeff Garzik <[email protected]>
5+
* Please ALWAYS copy [email protected]
6+
* on emails.
7+
*
8+
* Copyright 2003-2004 Red Hat, Inc. All rights reserved.
9+
* Copyright 2003-2004 Jeff Garzik
10+
*
11+
*
12+
* This program is free software; you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation; either version 2, or (at your option)
15+
* any later version.
16+
*
17+
* This program is distributed in the hope that it will be useful,
18+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
* GNU General Public License for more details.
21+
*
22+
* You should have received a copy of the GNU General Public License
23+
* along with this program; see the file COPYING. If not, write to
24+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
25+
*
26+
*
27+
* libata documentation is available via 'make {ps|pdf}docs',
28+
* as Documentation/DocBook/libata.*
29+
*
30+
* Hardware documentation available from
31+
* - http://www.t10.org/
32+
* - http://www.t13.org/
33+
*
2334
*/
2435

2536
#include <linux/kernel.h>

‎drivers/scsi/libata.h‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
/*
2-
libata.h - helper library for ATA
3-
4-
Copyright 2003-2004 Red Hat, Inc. All rights reserved.
5-
Copyright 2003-2004 Jeff Garzik
6-
7-
The contents of this file are subject to the Open
8-
Software License version 1.1 that can be found at
9-
http://www.opensource.org/licenses/osl-1.1.txt and is included herein
10-
by reference.
11-
12-
Alternatively, the contents of this file may be used under the terms
13-
of the GNU General Public License version 2 (the "GPL") as distributed
14-
in the kernel source COPYING file, in which case the provisions of
15-
the GPL are applicable instead of the above. If you wish to allow
16-
the use of your version of this file only under the terms of the
17-
GPL and not to allow others to use your version of this file under
18-
the OSL, indicate your decision by deleting the provisions above and
19-
replace them with the notice and other provisions required by the GPL.
20-
If you do not delete the provisions above, a recipient may use your
21-
version of this file under either the OSL or the GPL.
22-
2+
* libata.h - helper library for ATA
3+
*
4+
* Copyright 2003-2004 Red Hat, Inc. All rights reserved.
5+
* Copyright 2003-2004 Jeff Garzik
6+
*
7+
*
8+
* This program is free software; you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation; either version 2, or (at your option)
11+
* any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program; see the file COPYING. If not, write to
20+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
21+
*
22+
*
23+
* libata documentation is available via 'make {ps|pdf}docs',
24+
* as Documentation/DocBook/libata.*
25+
*
2326
*/
2427

2528
#ifndef __LIBATA_H__

‎drivers/scsi/sata_nv.c‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,31 @@
44
* Copyright 2004 NVIDIA Corp. All rights reserved.
55
* Copyright 2004 Andrew Chew
66
*
7-
* The contents of this file are subject to the Open
8-
* Software License version 1.1 that can be found at
9-
* http://www.opensource.org/licenses/osl-1.1.txt and is included herein
10-
* by reference.
117
*
12-
* Alternatively, the contents of this file may be used under the terms
13-
* of the GNU General Public License version 2 (the "GPL") as distributed
14-
* in the kernel source COPYING file, in which case the provisions of
15-
* the GPL are applicable instead of the above. If you wish to allow
16-
* the use of your version of this file only under the terms of the
17-
* GPL and not to allow others to use your version of this file under
18-
* the OSL, indicate your decision by deleting the provisions above and
19-
* replace them with the notice and other provisions required by the GPL.
20-
* If you do not delete the provisions above, a recipient may use your
21-
* version of this file under either the OSL or the GPL.
8+
* This program is free software; you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation; either version 2, or (at your option)
11+
* any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program; see the file COPYING. If not, write to
20+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
21+
*
22+
*
23+
* libata documentation is available via 'make {ps|pdf}docs',
24+
* as Documentation/DocBook/libata.*
25+
*
26+
* No hardware documentation available outside of NVIDIA.
27+
* This driver programs the NVIDIA SATA controller in a similar
28+
* fashion as with other PCI IDE BMDMA controllers, with a few
29+
* NV-specific details such as register offsets, SATA phy location,
30+
* hotplug info, etc.
31+
*
2232
*
2333
* 0.08
2434
* - Added support for MCP51 and MCP55.

‎drivers/scsi/sata_promise.c‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,26 @@
77
*
88
* Copyright 2003-2004 Red Hat, Inc.
99
*
10-
* The contents of this file are subject to the Open
11-
* Software License version 1.1 that can be found at
12-
* http://www.opensource.org/licenses/osl-1.1.txt and is included herein
13-
* by reference.
1410
*
15-
* Alternatively, the contents of this file may be used under the terms
16-
* of the GNU General Public License version 2 (the "GPL") as distributed
17-
* in the kernel source COPYING file, in which case the provisions of
18-
* the GPL are applicable instead of the above. If you wish to allow
19-
* the use of your version of this file only under the terms of the
20-
* GPL and not to allow others to use your version of this file under
21-
* the OSL, indicate your decision by deleting the provisions above and
22-
* replace them with the notice and other provisions required by the GPL.
23-
* If you do not delete the provisions above, a recipient may use your
24-
* version of this file under either the OSL or the GPL.
11+
* This program is free software; you can redistribute it and/or modify
12+
* it under the terms of the GNU General Public License as published by
13+
* the Free Software Foundation; either version 2, or (at your option)
14+
* any later version.
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU General Public License
22+
* along with this program; see the file COPYING. If not, write to
23+
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
24+
*
25+
*
26+
* libata documentation is available via 'make {ps|pdf}docs',
27+
* as Documentation/DocBook/libata.*
28+
*
29+
* Hardware information only available under NDA.
2530
*
2631
*/
2732

0 commit comments

Comments
 (0)