Skip to content

Commit bbb2008

Browse files
djbwdjbw
committed
Merge branch 'dmaengine' into async-tx-next
Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c
2 parents 3e48e65 + 657a77f commit bbb2008

File tree

7,830 files changed

+828014
-446633
lines changed

Some content is hidden

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

7,830 files changed

+828014
-446633
lines changed

‎.gitignore‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# subdirectories here. Add them in the ".gitignore" file
44
# in that subdirectory instead.
55
#
6-
# NOTE! Please use 'git-ls-files -i --exclude-standard'
6+
# NOTE! Please use 'git ls-files -i --exclude-standard'
77
# command after changing this file, to see if there are
88
# any tracked files which get ignored after the change.
99
#
@@ -25,6 +25,8 @@
2525
*.elf
2626
*.bin
2727
*.gz
28+
*.lzma
29+
*.patch
2830

2931
#
3032
# Top-level generic files
@@ -62,6 +64,12 @@ series
6264
cscope.*
6365
ncscope.*
6466

67+
# gnu global files
68+
GPATH
69+
GRTAGS
70+
GSYMS
71+
GTAGS
72+
6573
*.orig
6674
*~
6775
\#*#

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
12531253
S: Sterling Heights, Michigan 48313
12541254
S: USA
12551255

1256+
N: Wolfgang Grandegger
1257+
E: [email protected]
1258+
D: Controller Area Network (device drivers)
1259+
12561260
N: William Greathouse
12571261
E: [email protected]
12581262
E: [email protected]

‎Documentation/ABI/testing/sysfs-block‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,62 @@ Description:
6060
Indicates whether the block layer should automatically
6161
generate checksums for write requests bound for
6262
devices that support receiving integrity metadata.
63+
64+
What: /sys/block/<disk>/alignment_offset
65+
Date: April 2009
66+
Contact: Martin K. Petersen <[email protected]>
67+
Description:
68+
Storage devices may report a physical block size that is
69+
bigger than the logical block size (for instance a drive
70+
with 4KB physical sectors exposing 512-byte logical
71+
blocks to the operating system). This parameter
72+
indicates how many bytes the beginning of the device is
73+
offset from the disk's natural alignment.
74+
75+
What: /sys/block/<disk>/<partition>/alignment_offset
76+
Date: April 2009
77+
Contact: Martin K. Petersen <[email protected]>
78+
Description:
79+
Storage devices may report a physical block size that is
80+
bigger than the logical block size (for instance a drive
81+
with 4KB physical sectors exposing 512-byte logical
82+
blocks to the operating system). This parameter
83+
indicates how many bytes the beginning of the partition
84+
is offset from the disk's natural alignment.
85+
86+
What: /sys/block/<disk>/queue/logical_block_size
87+
Date: May 2009
88+
Contact: Martin K. Petersen <[email protected]>
89+
Description:
90+
This is the smallest unit the storage device can
91+
address. It is typically 512 bytes.
92+
93+
What: /sys/block/<disk>/queue/physical_block_size
94+
Date: May 2009
95+
Contact: Martin K. Petersen <[email protected]>
96+
Description:
97+
This is the smallest unit the storage device can write
98+
without resorting to read-modify-write operation. It is
99+
usually the same as the logical block size but may be
100+
bigger. One example is SATA drives with 4KB sectors
101+
that expose a 512-byte logical block size to the
102+
operating system.
103+
104+
What: /sys/block/<disk>/queue/minimum_io_size
105+
Date: April 2009
106+
Contact: Martin K. Petersen <[email protected]>
107+
Description:
108+
Storage devices may report a preferred minimum I/O size,
109+
which is the smallest request the device can perform
110+
without incurring a read-modify-write penalty. For disk
111+
drives this is often the physical block size. For RAID
112+
arrays it is often the stripe chunk size.
113+
114+
What: /sys/block/<disk>/queue/optimal_io_size
115+
Date: April 2009
116+
Contact: Martin K. Petersen <[email protected]>
117+
Description:
118+
Storage devices may report an optimal I/O size, which is
119+
the device's preferred unit of receiving I/O. This is
120+
rarely reported for disk drives. For RAID devices it is
121+
usually the stripe width or the internal block size.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,10 @@ Description:
122122
This symbolic link appears when a device is a Virtual Function.
123123
The symbolic link points to the PCI device sysfs entry of the
124124
Physical Function this device associates with.
125+
126+
What: /sys/bus/pci/slots/.../module
127+
Date: June 2009
128+
Contact: [email protected]
129+
Description:
130+
This symbolic link points to the PCI hotplug controller driver
131+
module that manages the hotplug slot.

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/model
2+
Date: March 2009
3+
Kernel Version: 2.6.30
4+
Contact: [email protected]
5+
Description: Displays the SCSI INQUIRY page 0 model for logical drive
6+
Y of controller X.
7+
8+
Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/rev
9+
Date: March 2009
10+
Kernel Version: 2.6.30
11+
Contact: [email protected]
12+
Description: Displays the SCSI INQUIRY page 0 revision for logical
13+
drive Y of controller X.
14+
15+
Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/unique_id
16+
Date: March 2009
17+
Kernel Version: 2.6.30
18+
Contact: [email protected]
19+
Description: Displays the SCSI INQUIRY page 83 serial number for logical
20+
drive Y of controller X.
21+
22+
Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/vendor
23+
Date: March 2009
24+
Kernel Version: 2.6.30
25+
Contact: [email protected]
26+
Description: Displays the SCSI INQUIRY page 0 vendor for logical drive
27+
Y of controller X.
28+
29+
Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/block:cciss!cXdY
30+
Date: March 2009
31+
Kernel Version: 2.6.30
32+
Contact: [email protected]
33+
Description: A symbolic link to /sys/block/cciss!cXdY

‎Documentation/ABI/testing/sysfs-class-mtd‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
What: /sys/class/mtd/
2+
Date: April 2009
3+
KernelVersion: 2.6.29
4+
Contact: [email protected]
5+
Description:
6+
The mtd/ class subdirectory belongs to the MTD subsystem
7+
(MTD core).
8+
9+
What: /sys/class/mtd/mtdX/
10+
Date: April 2009
11+
KernelVersion: 2.6.29
12+
Contact: [email protected]
13+
Description:
14+
The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond
15+
to each /dev/mtdX character device. These may represent
16+
physical/simulated flash devices, partitions on a flash
17+
device, or concatenated flash devices. They exist regardless
18+
of whether CONFIG_MTD_CHAR is actually enabled.
19+
20+
What: /sys/class/mtd/mtdXro/
21+
Date: April 2009
22+
KernelVersion: 2.6.29
23+
Contact: [email protected]
24+
Description:
25+
These directories provide the corresponding read-only device
26+
nodes for /sys/class/mtd/mtdX/ . They are only created
27+
(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.
28+
29+
What: /sys/class/mtd/mtdX/dev
30+
Date: April 2009
31+
KernelVersion: 2.6.29
32+
Contact: [email protected]
33+
Description:
34+
Major and minor numbers of the character device corresponding
35+
to this MTD device (in <major>:<minor> format). This is the
36+
read-write device so <minor> will be even.
37+
38+
What: /sys/class/mtd/mtdXro/dev
39+
Date: April 2009
40+
KernelVersion: 2.6.29
41+
Contact: [email protected]
42+
Description:
43+
Major and minor numbers of the character device corresponding
44+
to the read-only variant of thie MTD device (in
45+
<major>:<minor> format). In this case <minor> will be odd.
46+
47+
What: /sys/class/mtd/mtdX/erasesize
48+
Date: April 2009
49+
KernelVersion: 2.6.29
50+
Contact: [email protected]
51+
Description:
52+
"Major" erase size for the device. If numeraseregions is
53+
zero, this is the eraseblock size for the entire device.
54+
Otherwise, the MEMGETREGIONCOUNT/MEMGETREGIONINFO ioctls
55+
can be used to determine the actual eraseblock layout.
56+
57+
What: /sys/class/mtd/mtdX/flags
58+
Date: April 2009
59+
KernelVersion: 2.6.29
60+
Contact: [email protected]
61+
Description:
62+
A hexadecimal value representing the device flags, ORed
63+
together:
64+
65+
0x0400: MTD_WRITEABLE - device is writable
66+
0x0800: MTD_BIT_WRITEABLE - single bits can be flipped
67+
0x1000: MTD_NO_ERASE - no erase necessary
68+
0x2000: MTD_POWERUP_LOCK - always locked after reset
69+
70+
What: /sys/class/mtd/mtdX/name
71+
Date: April 2009
72+
KernelVersion: 2.6.29
73+
Contact: [email protected]
74+
Description:
75+
A human-readable ASCII name for the device or partition.
76+
This will match the name in /proc/mtd .
77+
78+
What: /sys/class/mtd/mtdX/numeraseregions
79+
Date: April 2009
80+
KernelVersion: 2.6.29
81+
Contact: [email protected]
82+
Description:
83+
For devices that have variable eraseblock sizes, this
84+
provides the total number of erase regions. Otherwise,
85+
it will read back as zero.
86+
87+
What: /sys/class/mtd/mtdX/oobsize
88+
Date: April 2009
89+
KernelVersion: 2.6.29
90+
Contact: [email protected]
91+
Description:
92+
Number of OOB bytes per page.
93+
94+
What: /sys/class/mtd/mtdX/size
95+
Date: April 2009
96+
KernelVersion: 2.6.29
97+
Contact: [email protected]
98+
Description:
99+
Total size of the device/partition, in bytes.
100+
101+
What: /sys/class/mtd/mtdX/type
102+
Date: April 2009
103+
KernelVersion: 2.6.29
104+
Contact: [email protected]
105+
Description:
106+
One of the following ASCII strings, representing the device
107+
type:
108+
109+
absent, ram, rom, nor, nand, dataflash, ubi, unknown
110+
111+
What: /sys/class/mtd/mtdX/writesize
112+
Date: April 2009
113+
KernelVersion: 2.6.29
114+
Contact: [email protected]
115+
Description:
116+
Minimal writable flash unit size. This will always be
117+
a positive integer.
118+
119+
In the case of NOR flash it is 1 (even though individual
120+
bits can be cleared).
121+
122+
In the case of NAND flash it is one NAND page (or a
123+
half page, or a quarter page).
124+
125+
In the case of ECC NOR, it is the ECC block size.

‎Documentation/ABI/testing/sysfs-devices-cache_disable‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
2+
Date: August 2008
3+
KernelVersion: 2.6.27
4+
Contact: [email protected]
5+
Description: These files exist in every cpu's cache index directories.
6+
There are currently 2 cache_disable_# files in each
7+
directory. Reading from these files on a supported
8+
processor will return that cache disable index value
9+
for that processor and node. Writing to one of these
10+
files will cause the specificed cache index to be disabled.
11+
12+
Currently, only AMD Family 10h Processors support cache index
13+
disable, and only for their L3 caches. See the BIOS and
14+
Kernel Developer's Guide at
15+
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
16+
for formatting information and other details on the
17+
cache index disable.
18+
Users: [email protected]

‎Documentation/ABI/testing/sysfs-fs-ext4‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,13 @@ Description:
7979
This file is read-only and shows the number of
8080
kilobytes of data that have been written to this
8181
filesystem since it was mounted.
82+
83+
What: /sys/fs/ext4/<disk>/inode_goal
84+
Date: June 2008
85+
Contact: "Theodore Ts'o" <[email protected]>
86+
Description:
87+
Tuning parameter which (if non-zero) controls the goal
88+
inode used by the inode allocator in p0reference to
89+
all other allocation hueristics. This is intended for
90+
debugging use only, and should be 0 on production
91+
systems.

‎Documentation/ABI/testing/sysfs-pps‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
What: /sys/class/pps/
2+
Date: February 2008
3+
Contact: Rodolfo Giometti <[email protected]>
4+
Description:
5+
The /sys/class/pps/ directory will contain files and
6+
directories that will provide a unified interface to
7+
the PPS sources.
8+
9+
What: /sys/class/pps/ppsX/
10+
Date: February 2008
11+
Contact: Rodolfo Giometti <[email protected]>
12+
Description:
13+
The /sys/class/pps/ppsX/ directory is related to X-th
14+
PPS source into the system. Each directory will
15+
contain files to manage and control its PPS source.
16+
17+
What: /sys/class/pps/ppsX/assert
18+
Date: February 2008
19+
Contact: Rodolfo Giometti <[email protected]>
20+
Description:
21+
The /sys/class/pps/ppsX/assert file reports the assert events
22+
and the assert sequence number of the X-th source in the form:
23+
24+
<secs>.<nsec>#<sequence>
25+
26+
If the source has no assert events the content of this file
27+
is empty.
28+
29+
What: /sys/class/pps/ppsX/clear
30+
Date: February 2008
31+
Contact: Rodolfo Giometti <[email protected]>
32+
Description:
33+
The /sys/class/pps/ppsX/clear file reports the clear events
34+
and the clear sequence number of the X-th source in the form:
35+
36+
<secs>.<nsec>#<sequence>
37+
38+
If the source has no clear events the content of this file
39+
is empty.
40+
41+
What: /sys/class/pps/ppsX/mode
42+
Date: February 2008
43+
Contact: Rodolfo Giometti <[email protected]>
44+
Description:
45+
The /sys/class/pps/ppsX/mode file reports the functioning
46+
mode of the X-th source in hexadecimal encoding.
47+
48+
Please, refer to linux/include/linux/pps.h for further
49+
info.
50+
51+
What: /sys/class/pps/ppsX/echo
52+
Date: February 2008
53+
Contact: Rodolfo Giometti <[email protected]>
54+
Description:
55+
The /sys/class/pps/ppsX/echo file reports if the X-th does
56+
or does not support an "echo" function.
57+
58+
What: /sys/class/pps/ppsX/name
59+
Date: February 2008
60+
Contact: Rodolfo Giometti <[email protected]>
61+
Description:
62+
The /sys/class/pps/ppsX/name file reports the name of the
63+
X-th source.
64+
65+
What: /sys/class/pps/ppsX/path
66+
Date: February 2008
67+
Contact: Rodolfo Giometti <[email protected]>
68+
Description:
69+
The /sys/class/pps/ppsX/path file reports the path name of
70+
the device connected with the X-th source.
71+
72+
If the source is not connected with any device the content
73+
of this file is empty.

0 commit comments

Comments
 (0)