Skip to content

Commit 8990c1b

Browse files
michal42michal42
committed
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
2 parents 2979076 + c8ddb27 commit 8990c1b

File tree

15,045 files changed

+1541143
-1109451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

15,045 files changed

+1541143
-1109451
lines changed

‎CREDITS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3554,12 +3554,12 @@ E: cvance@nai.com
35543554
D: portions of the Linux Security Module (LSM) framework and security modules
35553555

35563556
N: Petr Vandrovec
3557-
E: vandrove@vc.cvut.cz
3557+
E: petr@vandrovec.name
35583558
D: Small contributions to ncpfs
35593559
D: Matrox framebuffer driver
3560-
S: Chudenicka 8
3561-
S: 10200 Prague 10, Hostivar
3562-
S: Czech Republic
3560+
S: 21513 Conradia Ct
3561+
S: Cupertino, CA 95014
3562+
S: USA
35633563

35643564
N: Thibaut Varene
35653565
E: T-Bone@parisc-linux.org

‎Documentation/00-INDEX‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ edac.txt
130130
- information on EDAC - Error Detection And Correction
131131
eisa.txt
132132
- info on EISA bus support.
133-
exception.txt
134-
- how Linux v2.2 handles exceptions without verify_area etc.
135133
fault-injection/
136134
- dir with docs about the fault injection capabilities infrastructure.
137135
fb/
@@ -234,6 +232,8 @@ memory.txt
234232
- info on typical Linux memory problems.
235233
mips/
236234
- directory with info about Linux on MIPS architecture.
235+
mmc/
236+
- directory with info about the MMC subsystem
237237
mono.txt
238238
- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
239239
mutex-design.txt

‎Documentation/ABI/obsolete/dv1394‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Documentation/ABI/removed/dv1394‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: linux1394-devel@lists.sourceforge.net
4+
Description:
5+
/dev/dv1394/* were character device files, one for each FireWire
6+
controller and for NTSC and PAL respectively, from which DV data
7+
could be received by read() or transmitted by write(). A few
8+
ioctl()s allowed limited control.
9+
This special-purpose interface has been superseded by libraw1394 +
10+
libiec61883 which are functionally equivalent, support HDV, and
11+
transparently work on top of the newer firewire kernel drivers.
12+
13+
Users:
14+
ffmpeg/libavformat (if configured for DV1394)

‎Documentation/ABI/removed/raw1394‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: raw1394 (a.k.a. "Raw IEEE1394 I/O support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: linux1394-devel@lists.sourceforge.net
4+
Description:
5+
/dev/raw1394 was a character device file that allowed low-level
6+
access to FireWire buses. Its major drawbacks were its inability
7+
to implement sensible device security policies, and its low level
8+
of abstraction that required userspace clients do duplicate much
9+
of the kernel's ieee1394 core functionality.
10+
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
11+
firewire-core.
12+
13+
Users:
14+
libraw1394 (works with firewire-cdev too, transparent to library ABI
15+
users)

‎Documentation/ABI/removed/raw1394_legacy_isochronous‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Documentation/ABI/removed/video1394‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
2+
Date: May 2010 (scheduled), finally removed in kernel v2.6.37
3+
Contact: linux1394-devel@lists.sourceforge.net
4+
Description:
5+
/dev/video1394/* were character device files, one for each FireWire
6+
controller, which were used for isochronous I/O. It was added as an
7+
alternative to raw1394's isochronous I/O functionality which had
8+
performance issues in its first generation. Any video1394 user had
9+
to use raw1394 + libraw1394 too because video1394 did not provide
10+
asynchronous I/O for device discovery and configuration.
11+
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
12+
firewire-core.
13+
14+
Users:
15+
libdc1394 (works with firewire-cdev too, transparent to library ABI
16+
users)

‎Documentation/ABI/testing/debugfs-ec‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/kernel/debug/ec/*/{gpe,use_global_lock,io}
2+
Date: July 2010
3+
Contact: Thomas Renninger <trenn@suse.de>
4+
Description:
5+
6+
General information like which GPE is assigned to the EC and whether
7+
the global lock should get used.
8+
Knowing the EC GPE one can watch the amount of HW events related to
9+
the EC here (XY -> GPE number from /sys/kernel/debug/ec/*/gpe):
10+
/sys/firmware/acpi/interrupts/gpeXY
11+
12+
The io file is binary and a userspace tool located here:
13+
ftp://ftp.suse.com/pub/people/trenn/sources/ec/
14+
should get used to read out the 256 Embedded Controller registers
15+
or writing to them.
16+
17+
CAUTION: Do not write to the Embedded Controller if you don't know
18+
what you are doing! Rebooting afterwards also is a good idea.
19+
This can influence the way your machine is cooled and fans may
20+
not get switched on again after you did a wrong write.

‎Documentation/ABI/testing/debugfs-kmemtrace‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎Documentation/ABI/testing/sysfs-ata‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
What: /sys/class/ata_...
2+
Date: August 2008
3+
Contact: Gwendal Grignou<gwendal@google.com>
4+
Description:
5+
6+
Provide a place in sysfs for storing the ATA topology of the system. This allows
7+
retrieving various information about ATA objects.
8+
9+
Files under /sys/class/ata_port
10+
-------------------------------
11+
12+
For each port, a directory ataX is created where X is the ata_port_id of
13+
the port. The device parent is the ata host device.
14+
15+
idle_irq (read)
16+
17+
Number of IRQ received by the port while idle [some ata HBA only].
18+
19+
nr_pmp_links (read)
20+
21+
If a SATA Port Multiplier (PM) is connected, number of link behind it.
22+
23+
Files under /sys/class/ata_link
24+
-------------------------------
25+
26+
Behind each port, there is a ata_link. If there is a SATA PM in the
27+
topology, 15 ata_link objects are created.
28+
29+
If a link is behind a port, the directory name is linkX, where X is
30+
ata_port_id of the port.
31+
If a link is behind a PM, its name is linkX.Y where X is ata_port_id
32+
of the parent port and Y the PM port.
33+
34+
hw_sata_spd_limit
35+
36+
Maximum speed supported by the connected SATA device.
37+
38+
sata_spd_limit
39+
40+
Maximum speed imposed by libata.
41+
42+
sata_spd
43+
44+
Current speed of the link [1.5, 3Gps,...].
45+
46+
Files under /sys/class/ata_device
47+
---------------------------------
48+
49+
Behind each link, up to two ata device are created.
50+
The name of the directory is devX[.Y].Z where:
51+
- X is ata_port_id of the port where the device is connected,
52+
- Y the port of the PM if any, and
53+
- Z the device id: for PATA, there is usually 2 devices [0,1],
54+
only 1 for SATA.
55+
56+
class
57+
Device class. Can be "ata" for disk, "atapi" for packet device,
58+
"pmp" for PM, or "none" if no device was found behind the link.
59+
60+
dma_mode
61+
62+
Transfer modes supported by the device when in DMA mode.
63+
Mostly used by PATA device.
64+
65+
pio_mode
66+
67+
Transfer modes supported by the device when in PIO mode.
68+
Mostly used by PATA device.
69+
70+
xfer_mode
71+
72+
Current transfer mode.
73+
74+
id
75+
76+
Cached result of IDENTIFY command, as described in ATA8 7.16 and 7.17.
77+
Only valid if the device is not a PM.
78+
79+
gscr
80+
81+
Cached result of the dump of PM GSCR register.
82+
Valid registers are:
83+
0: SATA_PMP_GSCR_PROD_ID,
84+
1: SATA_PMP_GSCR_REV,
85+
2: SATA_PMP_GSCR_PORT_INFO,
86+
32: SATA_PMP_GSCR_ERROR,
87+
33: SATA_PMP_GSCR_ERROR_EN,
88+
64: SATA_PMP_GSCR_FEAT,
89+
96: SATA_PMP_GSCR_FEAT_EN,
90+
130: SATA_PMP_GSCR_SII_GPIO
91+
Only valid if the device is a PM.
92+
93+
spdn_cnt
94+
95+
Number of time libata decided to lower the speed of link due to errors.
96+
97+
ering
98+
99+
Formatted output of the error ring of the device.

0 commit comments

Comments
 (0)