Skip to content

Commit 020abf0

Browse files
author
Stefan Richter
committed
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and sound/firewire/.
2 parents 0ff8fbc + 693d92a commit 020abf0

File tree

15,231 files changed

+1237611
-620114
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,231 files changed

+1237611
-620114
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ modules.builtin
2828
*.gz
2929
*.bz2
3030
*.lzma
31+
*.xz
3132
*.lzo
3233
*.patch
3334
*.gcno

‎.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ Andreas Herrmann <aherrman@de.ibm.com>
2020
Andrew Morton <akpm@osdl.org>
2121
Andrew Vasquez <andrew.vasquez@qlogic.com>
2222
Andy Adamson <andros@citi.umich.edu>
23+
Archit Taneja <archit@ti.com>
2324
Arnaud Patard <arnaud.patard@rtp-net.org>
2425
Arnd Bergmann <arnd@arndb.de>
2526
Axel Dyks <xl@xlsigned.net>
27+
Axel Lin <axel.lin@gmail.com>
2628
Ben Gardner <bgardner@wabtec.com>
2729
Ben M Cahill <ben.m.cahill@intel.com>
2830
Björn Steinbrink <B.Steinbrink@gmx.de>
@@ -69,6 +71,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
6971
Linas Vepstas <linas@austin.ibm.com>
7072
Mark Brown <broonie@sirena.org.uk>
7173
Matthieu CASTET <castet.matthieu@free.fr>
74+
Mayuresh Janorkar <mayur@ti.com>
7275
Michael Buesch <mb@bu3sch.de>
7376
Michael Buesch <mbuesch@freenet.de>
7477
Michel Dänzer <michel@tungstengraphics.com>
@@ -77,6 +80,7 @@ Morten Welinder <terra@gnome.org>
7780
Morten Welinder <welinder@anemone.rentec.com>
7881
Morten Welinder <welinder@darter.rentec.com>
7982
Morten Welinder <welinder@troll.com>
83+
Mythri P K <mythripk@ti.com>
8084
Nguyen Anh Quynh <aquynh@gmail.com>
8185
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
8286
Patrick Mochel <mochel@digitalimplant.org>
@@ -97,6 +101,7 @@ S.Çağlar Onur <caglar@pardus.org.tr>
97101
Simon Kelley <simon@thekelleys.org.uk>
98102
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
99103
Stephen Hemminger <shemminger@osdl.org>
104+
Sumit Semwal <sumit.semwal@ti.com>
100105
Tejun Heo <htejun@gmail.com>
101106
Thomas Graf <tgraf@suug.ch>
102107
Tony Luck <tony.luck@intel.com>
@@ -105,3 +110,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
105110
Uwe Kleine-König <ukl@pengutronix.de>
106111
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
107112
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
113+
Takashi YOSHII <takashi.yoshii.zj@renesas.com>

‎CREDITS

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
16771677
D: Assorted VIA x86 support.
16781678
D: 2.5 AGPGART overhaul.
16791679
D: CPUFREQ maintenance.
1680-
D: Fedora kernel maintainence.
1680+
D: Fedora kernel maintenance.
16811681
D: Misc/Other.
16821682
S: 314 Littleton Rd, Westford, MA 01886, USA
16831683

@@ -2365,8 +2365,6 @@ E: acme@redhat.com
23652365
W: http://oops.ghostprotocols.net:81/blog/
23662366
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
23672367
D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
2368-
S: R. Brasílio Itiberê, 4270/1010 - Água Verde
2369-
S: 80240-060 - Curitiba - Paraná
23702368
S: Brazil
23712369

23722370
N: Karsten Merker
@@ -2813,8 +2811,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
28132811
N: Stelian Pop
28142812
E: stelian@popies.net
28152813
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
2816-
D: sonypi, meye drivers, mct_u232 usb serial hacks
2817-
S: Paris, France
2814+
D: random kernel hacks
2815+
S: Paimpont, France
28182816

28192817
N: Pete Popov
28202818
E: pete_popov@yahoo.com
@@ -3213,7 +3211,7 @@ N: James Simmons
32133211
E: jsimmons@infradead.org
32143212
E: jsimmons@users.sf.net
32153213
D: Frame buffer device maintainer
3216-
D: input layer developement
3214+
D: input layer development
32173215
D: tty/console layer
32183216
D: various mipsel devices
32193217
S: 115 Carmel Avenue
@@ -3292,7 +3290,7 @@ S: USA
32923290
N: Manfred Spraul
32933291
E: manfred@colorfullife.com
32943292
W: http://www.colorfullife.com/~manfred
3295-
D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
3293+
D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
32963294
D: slab, pipe, select.
32973295
S: 71701 Schwieberdingen
32983296
S: Germany

‎Documentation/00-INDEX

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ laptops/
206206
- directory with laptop related info and laptop driver documentation.
207207
ldm.txt
208208
- a brief description of LDM (Windows Dynamic Disks).
209-
leds-class.txt
210-
- documents LED handling under Linux.
209+
leds/
210+
- directory with info about LED handling under Linux.
211211
local_ops.txt
212212
- semantics and behavior of local atomic operations.
213213
lockdep-design.txt
@@ -328,8 +328,6 @@ sysrq.txt
328328
- info on the magic SysRq key.
329329
telephony/
330330
- directory with info on telephony (e.g. voice over IP) support.
331-
time_interpolators.txt
332-
- info on time interpolators.
333331
uml/
334332
- directory with information about User Mode Linux.
335333
unicode.txt
@@ -346,8 +344,6 @@ vm/
346344
- directory with info on the Linux vm code.
347345
volatile-considered-harmful.txt
348346
- Why the "volatile" type class should not be used
349-
voyager.txt
350-
- guide to running Linux on the Voyager architecture.
351347
w1/
352348
- directory with documents regarding the 1-wire (w1) subsystem.
353349
watchdog/

‎Documentation/ABI/stable/sysfs-class-backlight

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,23 @@ Contact: Richard Purdie <rpurdie@rpsys.net>
3434
Description:
3535
Maximum brightness for <backlight>.
3636
Users: HAL
37+
38+
What: /sys/class/backlight/<backlight>/type
39+
Date: September 2010
40+
KernelVersion: 2.6.37
41+
Contact: Matthew Garrett <mjg@redhat.com>
42+
Description:
43+
The type of interface controlled by <backlight>.
44+
"firmware": The driver uses a standard firmware interface
45+
"platform": The driver uses a platform-specific interface
46+
"raw": The driver controls hardware registers directly
47+
48+
In the general case, when multiple backlight
49+
interfaces are available for a single device, firmware
50+
control should be preferred to platform control should
51+
be preferred to raw control. Using a firmware
52+
interface reduces the probability of confusion with
53+
the hardware and the OS independently updating the
54+
backlight state. Platform interfaces are mostly a
55+
holdover from pre-standardisation of firmware
56+
interfaces.

‎Documentation/ABI/stable/sysfs-firmware-efi-vars

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
What: /sys/firmware/efi/vars
2+
Date: April 2004
3+
Contact: Matt Domsch <Matt_Domsch@dell.com>
4+
Description:
5+
This directory exposes interfaces for interactive with
6+
EFI variables. For more information on EFI variables,
7+
see 'Variable Services' in the UEFI specification
8+
(section 7.2 in specification version 2.3 Errata D).
9+
10+
In summary, EFI variables are named, and are classified
11+
into separate namespaces through the use of a vendor
12+
GUID. They also have an arbitrary binary value
13+
associated with them.
14+
15+
The efivars module enumerates these variables and
16+
creates a separate directory for each one found. Each
17+
directory has a name of the form "<key>-<vendor guid>"
18+
and contains the following files:
19+
20+
attributes: A read-only text file enumerating the
21+
EFI variable flags. Potential values
22+
include:
23+
24+
EFI_VARIABLE_NON_VOLATILE
25+
EFI_VARIABLE_BOOTSERVICE_ACCESS
26+
EFI_VARIABLE_RUNTIME_ACCESS
27+
EFI_VARIABLE_HARDWARE_ERROR_RECORD
28+
EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS
29+
30+
See the EFI documentation for an
31+
explanation of each of these variables.
32+
33+
data: A read-only binary file that can be read
34+
to attain the value of the EFI variable
35+
36+
guid: The vendor GUID of the variable. This
37+
should always match the GUID in the
38+
variable's name.
39+
40+
raw_var: A binary file that can be read to obtain
41+
a structure that contains everything
42+
there is to know about the variable.
43+
For structure definition see "struct
44+
efi_variable" in the kernel sources.
45+
46+
This file can also be written to in
47+
order to update the value of a variable.
48+
For this to work however, all fields of
49+
the "struct efi_variable" passed must
50+
match byte for byte with the structure
51+
read out of the file, save for the value
52+
portion.
53+
54+
**Note** the efi_variable structure
55+
read/written with this file contains a
56+
'long' type that may change widths
57+
depending on your underlying
58+
architecture.
59+
60+
size: As ASCII representation of the size of
61+
the variable's value.
62+
63+
64+
In addition, two other magic binary files are provided
65+
in the top-level directory and are used for adding and
66+
removing variables:
67+
68+
new_var: Takes a "struct efi_variable" and
69+
instructs the EFI firmware to create a
70+
new variable.
71+
72+
del_var: Takes a "struct efi_variable" and
73+
instructs the EFI firmware to remove any
74+
variable that has a matching vendor GUID
75+
and variable key name.

‎Documentation/ABI/stable/thermal-notification

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
What: A notification mechanism for thermal related events
2+
Description:
3+
This interface enables notification for thermal related events.
4+
The notification is in the form of a netlink event.

‎Documentation/ABI/testing/configfs-spear-pcie-gadget

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
What: /config/pcie-gadget
2+
Date: Feb 2011
3+
KernelVersion: 2.6.37
4+
Contact: Pratyush Anand <pratyush.anand@st.com>
5+
Description:
6+
7+
Interface is used to configure selected dual mode PCIe controller
8+
as device and then program its various registers to configure it
9+
as a particular device type.
10+
This interfaces can be used to show spear's PCIe device capability.
11+
12+
Nodes are only visible when configfs is mounted. To mount configfs
13+
in /config directory use:
14+
# mount -t configfs none /config/
15+
16+
For nth PCIe Device Controller
17+
/config/pcie-gadget.n/
18+
link ... used to enable ltssm and read its status.
19+
int_type ...used to configure and read type of supported
20+
interrupt
21+
no_of_msi ... used to configure number of MSI vector needed and
22+
to read no of MSI granted.
23+
inta ... write 1 to assert INTA and 0 to de-assert.
24+
send_msi ... write MSI vector to be sent.
25+
vendor_id ... used to write and read vendor id (hex)
26+
device_id ... used to write and read device id (hex)
27+
bar0_size ... used to write and read bar0_size
28+
bar0_address ... used to write and read bar0 mapped area in hex.
29+
bar0_rw_offset ... used to write and read offset of bar0 where
30+
bar0_data will be written or read.
31+
bar0_data ... used to write and read data at bar0_rw_offset.

‎Documentation/ABI/testing/pstore

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Where: /dev/pstore/...
2+
Date: March 2011
3+
Kernel Version: 2.6.39
4+
Contact: tony.luck@intel.com
5+
Description: Generic interface to platform dependent persistent storage.
6+
7+
Platforms that provide a mechanism to preserve some data
8+
across system reboots can register with this driver to
9+
provide a generic interface to show records captured in
10+
the dying moments. In the case of a panic the last part
11+
of the console log is captured, but other interesting
12+
data can also be saved.
13+
14+
# mount -t pstore -o kmsg_bytes=8000 - /dev/pstore
15+
16+
$ ls -l /dev/pstore
17+
total 0
18+
-r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1
19+
20+
Different users of this interface will result in different
21+
filename prefixes. Currently two are defined:
22+
23+
"dmesg" - saved console log
24+
"mce" - architecture dependent data from fatal h/w error
25+
26+
Once the information in a file has been read, removing
27+
the file will signal to the underlying persistent storage
28+
device that it can reclaim the space for later re-use.
29+
30+
$ rm /dev/pstore/dmesg-erst-1
31+
32+
The expectation is that all files in /dev/pstore
33+
will be saved elsewhere and erased from persistent store
34+
soon after boot to free up space ready for the next
35+
catastrophe.
36+
37+
The 'kmsg_bytes' mount option changes the target amount of
38+
data saved on each oops/panic. Pstore saves (possibly
39+
multiple) files based on the record size of the underlying
40+
persistent storage until at least this amount is reached.
41+
Default is 10 Kbytes.

‎Documentation/ABI/testing/sysfs-bus-css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
2929
linux-s390@vger.kernel.org
3030
Description: Contains the PIM/PAM/POM values, as reported by the
3131
channel subsystem when last queried by the common I/O
32-
layer (this implies that this attribute is not neccessarily
32+
layer (this implies that this attribute is not necessarily
3333
in sync with the values current in the channel subsystem).
3434
Note: This is an I/O-subchannel specific attribute.
3535
Users: s390-tools, HAL

‎Documentation/ABI/testing/sysfs-bus-media

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /sys/bus/media/devices/.../model
2+
Date: January 2011
3+
Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
4+
linux-media@vger.kernel.org
5+
Description: Contains the device model name in UTF-8. The device version is
6+
is not be appended to the model name.

‎Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,11 @@ Date: July 2010
145145
Contact: Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
146146
Description:
147147
Reading this attribute will provide the firmware
148-
given name(SMBIOS type 41 string) of the PCI device.
149-
The attribute will be created only if the firmware
150-
has given a name to the PCI device.
148+
given name (SMBIOS type 41 string or ACPI _DSM string) of
149+
the PCI device. The attribute will be created only
150+
if the firmware has given a name to the PCI device.
151+
ACPI _DSM string name will be given priority if the
152+
system firmware provides SMBIOS type 41 string also.
151153
Users:
152154
Userspace applications interested in knowing the
153155
firmware assigned name of the PCI device.
@@ -157,12 +159,27 @@ Date: July 2010
157159
Contact: Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
158160
Description:
159161
Reading this attribute will provide the firmware
160-
given instance(SMBIOS type 41 device type instance)
161-
of the PCI device. The attribute will be created
162-
only if the firmware has given a device type instance
163-
to the PCI device.
162+
given instance (SMBIOS type 41 device type instance) of the
163+
PCI device. The attribute will be created only if the firmware
164+
has given an instance number to the PCI device.
164165
Users:
165166
Userspace applications interested in knowing the
166167
firmware assigned device type instance of the PCI
167168
device that can help in understanding the firmware
168169
intended order of the PCI device.
170+
171+
What: /sys/bus/pci/devices/.../acpi_index
172+
Date: July 2010
173+
Contact: Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
174+
Description:
175+
Reading this attribute will provide the firmware
176+
given instance (ACPI _DSM instance number) of the PCI device.
177+
The attribute will be created only if the firmware has given
178+
an instance number to the PCI device. ACPI _DSM instance number
179+
will be given priority if the system firmware provides SMBIOS
180+
type 41 device type instance also.
181+
Users:
182+
Userspace applications interested in knowing the
183+
firmware assigned instance number of the PCI
184+
device that can help in understanding the firmware
185+
intended order of the PCI device.

‎Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,15 @@ Kernel Version: 2.6.31
5959
Contact: iss_storagedev@hp.com
6060
Description: Displays the usage count (number of opens) of logical drive Y
6161
of controller X.
62+
63+
Where: /sys/bus/pci/devices/<dev>/ccissX/resettable
64+
Date: February 2011
65+
Kernel Version: 2.6.38
66+
Contact: iss_storagedev@hp.com
67+
Description: Value of 1 indicates the controller can honor the reset_devices
68+
kernel parameter. Value of 0 indicates reset_devices cannot be
69+
honored. This is to allow, for example, kexec tools to be able
70+
to warn the user if they designate an unresettable device as
71+
a dump device, as kdump requires resetting the device in order
72+
to work reliably.
73+

‎Documentation/ABI/testing/sysfs-bus-rbd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/rbd/
22
Date: November 2010
3-
Contact: Yehuda Sadeh <yehuda@hq.newdream.net>,
3+
Contact: Yehuda Sadeh <yehuda@newdream.net>,
44
Sage Weil <sage@newdream.net>
55
Description:
66

0 commit comments

Comments
 (0)