Skip to content

Commit f056878

Browse files
author
Anton Vorontsov
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/power/wm97xx_battery.c
2 parents 3961f7c + 7fa0772 commit f056878

File tree

8,891 files changed

+930942
-484123
lines changed

Some content is hidden

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

8,891 files changed

+930942
-484123
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*.gz
2828
*.lzma
2929
*.patch
30+
*.gcno
3031

3132
#
3233
# Top-level generic files

‎CREDITS

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
18561856
D: The Linux Support Team Erlangen
18571857

18581858
N: Andreas Koensgen
1859-
E: ajk@iehk.rwth-aachen.de
1859+
E: ajk@comnets.uni-bremen.de
18601860
D: 6pack driver for AX.25
18611861

18621862
N: Harald Koerfgen
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
20062006
D: Soundblaster driver fixes, ISAPnP quirk
20072007
S: California, USA
20082008

2009+
N: Jonathan Layes
2010+
D: ARPD support
2011+
20092012
N: Tom Lees
20102013
E: tom@lpsg.demon.co.uk
20112014
W: http://www.lpsg.demon.co.uk/
@@ -2797,7 +2800,7 @@ D: Starter of Linux1394 effort
27972800
S: ask per mail for current address
27982801

27992802
N: Nicolas Pitre
2800-
E: nico@cam.org
2803+
E: nico@fluxnic.net
28012804
D: StrongARM SA1100 support integrator & hacker
28022805
D: Xscale PXA architecture
28032806
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
38023805
S: 2612 XV Delft
38033806
S: The Netherlands
38043807

3808+
N: Thomas Woller
3809+
D: CS461x Cirrus Logic sound driver
3810+
38053811
N: David Woodhouse
38063812
E: dwmw2@infradead.org
38073813
D: JFFS2 file system, Memory Technology Device subsystem,

‎Documentation/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ block/
8282
- info on the Block I/O (BIO) layer.
8383
blockdev/
8484
- info on block devices & drivers
85+
btmrvl.txt
86+
- info on Marvell Bluetooth driver usage.
8587
cachetlb.txt
8688
- describes the cache/TLB flushing interfaces Linux uses.
8789
cdrom/

‎Documentation/ABI/testing/sysfs-block

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size
9494
Date: May 2009
9595
Contact: Martin K. Petersen <martin.petersen@oracle.com>
9696
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.
97+
This is the smallest unit a physical storage device can
98+
write atomically. It is usually the same as the logical
99+
block size but may be bigger. One example is SATA
100+
drives with 4KB sectors that expose a 512-byte logical
101+
block size to the operating system. For stacked block
102+
devices the physical_block_size variable contains the
103+
maximum physical_block_size of the component devices.
103104

104105
What: /sys/block/<disk>/queue/minimum_io_size
105106
Date: April 2009
106107
Contact: Martin K. Petersen <martin.petersen@oracle.com>
107108
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.
109+
Storage devices may report a granularity or preferred
110+
minimum I/O size which is the smallest request the
111+
device can perform without incurring a performance
112+
penalty. For disk drives this is often the physical
113+
block size. For RAID arrays it is often the stripe
114+
chunk size. A properly aligned multiple of
115+
minimum_io_size is the preferred request size for
116+
workloads where a high number of I/O operations is
117+
desired.
113118

114119
What: /sys/block/<disk>/queue/optimal_io_size
115120
Date: April 2009
116121
Contact: Martin K. Petersen <martin.petersen@oracle.com>
117122
Description:
118123
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.
124+
the device's preferred unit for sustained I/O. This is
125+
rarely reported for disk drives. For RAID arrays it is
126+
usually the stripe width or the internal track size. A
127+
properly aligned multiple of optimal_io_size is the
128+
preferred request size for workloads where sustained
129+
throughput is desired. If no optimal I/O size is
130+
reported this file contains 0.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,16 @@ Description:
8484
from this part of the device tree.
8585
Depends on CONFIG_HOTPLUG.
8686

87+
What: /sys/bus/pci/devices/.../reset
88+
Date: July 2009
89+
Contact: Michael S. Tsirkin <mst@redhat.com>
90+
Description:
91+
Some devices allow an individual function to be reset
92+
without affecting other functions in the same device.
93+
For devices that have this support, a file named reset
94+
will be present in sysfs. Writing 1 to this file
95+
will perform reset.
96+
8797
What: /sys/bus/pci/devices/.../vpd
8898
Date: February 2008
8999
Contact: Ben Hutchings <bhutchings@solarflare.com>

‎Documentation/DocBook/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
1414
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
1515
mac80211.xml debugobjects.xml sh.xml regulator.xml \
1616
alsa-driver-api.xml writing-an-alsa-driver.xml \
17-
tracepoint.xml
17+
tracepoint.xml media.xml
1818

1919
###
2020
# The build process is as follows (targets):
@@ -32,7 +32,7 @@ PS_METHOD = $(prefer-db2x)
3232

3333
###
3434
# The targets that may be used.
35-
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
35+
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media
3636

3737
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
3838
xmldocs: $(BOOKS)
@@ -45,12 +45,16 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
4545
pdfdocs: $(PDF)
4646

4747
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
48-
htmldocs: $(HTML)
48+
htmldocs: media $(HTML)
4949
$(call build_main_index)
5050

5151
MAN := $(patsubst %.xml, %.9, $(BOOKS))
5252
mandocs: $(MAN)
5353

54+
media:
55+
mkdir -p $(srctree)/Documentation/DocBook/media/
56+
cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/
57+
5458
installmandocs: mandocs
5559
mkdir -p /usr/local/man/man9/
5660
install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/

‎Documentation/DocBook/dvb/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!*.xml

0 commit comments

Comments
 (0)