Skip to content

Commit e060c38

Browse files
author
Jiri Kosina
committed
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches based on more recent version of the tree.
2 parents 10e4ac5 + cc39c6a commit e060c38

3,980 files changed

Lines changed: 199093 additions & 61476 deletions

File tree

Some content is hidden

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

‎CREDITS‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ N: Dominik Brodowski
504504
E: linux@brodo.de
505505
W: http://www.brodo.de/
506506
P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6
507-
D: parts of CPUFreq code, ACPI bugfixes
507+
D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
508508
S: Tuebingen, Germany
509509

510510
N: Andries Brouwer
@@ -857,6 +857,10 @@ S: One Dell Way
857857
S: Round Rock, TX 78682
858858
S: USA
859859

860+
N: Mattia Dongili
861+
E: malattia@gmail.com
862+
D: cpufrequtils (precursor to cpupowerutils)
863+
860864
N: Ben Dooks
861865
E: ben-linux@fluff.org
862866
E: ben@simtec.co.uk
@@ -1883,6 +1887,11 @@ S: Kruislaan 419
18831887
S: 1098 VA Amsterdam
18841888
S: The Netherlands
18851889

1890+
N: Goran Koruga
1891+
E: korugag@siol.net
1892+
D: cpufrequtils (precursor to cpupowerutils)
1893+
S: Slovenia
1894+
18861895
N: Jiri Kosina
18871896
E: jikos@jikos.cz
18881897
E: jkosina@suse.cz
@@ -2916,6 +2925,12 @@ S: Schlossbergring 9
29162925
S: 79098 Freiburg
29172926
S: Germany
29182927

2928+
N: Thomas Renninger
2929+
E: trenn@suse.de
2930+
D: cpupowerutils
2931+
S: SUSE Linux GmbH
2932+
S: Germany
2933+
29192934
N: Joerg Reuter
29202935
E: jreuter@yaina.de
29212936
W: http://yaina.de/jreuter/

‎Documentation/00-INDEX‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ printk-formats.txt
272272
- how to get printk format specifiers right
273273
prio_tree.txt
274274
- info on radix-priority-search-tree use for indexing vmas.
275+
ramoops.txt
276+
- documentation of the ramoops oops/panic logging module.
275277
rbtree.txt
276278
- info on what red-black trees are and what they are for.
277279
robust-futex-ABI.txt

‎Documentation/ABI/testing/pstore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,9 @@ Description: Generic interface to platform dependent persistent storage.
3939
multiple) files based on the record size of the underlying
4040
persistent storage until at least this amount is reached.
4141
Default is 10 Kbytes.
42+
43+
Pstore only supports one backend at a time. If multiple
44+
backends are available, the preferred backend may be
45+
set by passing the pstore.backend= argument to the kernel at
46+
boot time.
47+

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/class/scsi_host/hostX/isci_id
2+
Date: June 2011
3+
Contact: Dave Jiang <dave.jiang@intel.com>
4+
Description:
5+
This file contains the enumerated host ID for the Intel
6+
SCU controller. The Intel(R) C600 Series Chipset SATA/SAS
7+
Storage Control Unit embeds up to two 4-port controllers in
8+
a single PCI device. The controllers are enumerated in order
9+
which usually means the lowest number scsi_host corresponds
10+
with the first controller, but this association is not
11+
guaranteed. The 'isci_id' attribute unambiguously identifies
12+
the controller index: '0' for the first controller,
13+
'1' for the second.

‎Documentation/ABI/testing/sysfs-platform-ideapad-laptop‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,20 @@ KernelVersion: 2.6.37
44
Contact: "Ike Panhc <ike.pan@canonical.com>"
55
Description:
66
Control the power of camera module. 1 means on, 0 means off.
7+
8+
What: /sys/devices/platform/ideapad/cfg
9+
Date: Jun 2011
10+
KernelVersion: 3.1
11+
Contact: "Ike Panhc <ike.pan@canonical.com>"
12+
Description:
13+
Ideapad capability bits.
14+
Bit 8-10: 1 - Intel graphic only
15+
2 - ATI graphic only
16+
3 - Nvidia graphic only
17+
4 - Intel and ATI graphic
18+
5 - Intel and Nvidia graphic
19+
Bit 16: Bluetooth exist (1 for exist)
20+
Bit 17: 3G exist (1 for exist)
21+
Bit 18: Wifi exist (1 for exist)
22+
Bit 19: Camera exist (1 for exist)
23+

‎Documentation/CodingStyle‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,13 @@ available tools.
8080
The limit on the length of lines is 80 columns and this is a strongly
8181
preferred limit.
8282

83-
Statements longer than 80 columns will be broken into sensible chunks.
84-
Descendants are always substantially shorter than the parent and are placed
85-
substantially to the right. The same applies to function headers with a long
86-
argument list. Long strings are as well broken into shorter strings. The
87-
only exception to this is where exceeding 80 columns significantly increases
88-
readability and does not hide information.
89-
90-
void fun(int a, int b, int c)
91-
{
92-
if (condition)
93-
printk(KERN_WARNING "Warning this is a long printk with "
94-
"3 parameters a: %u b: %u "
95-
"c: %u \n", a, b, c);
96-
else
97-
next_statement;
98-
}
83+
Statements longer than 80 columns will be broken into sensible chunks, unless
84+
exceeding 80 columns significantly increases readability and does not hide
85+
information. Descendants are always substantially shorter than the parent and
86+
are placed substantially to the right. The same applies to function headers
87+
with a long argument list. However, never break user-visible strings such as
88+
printk messages, because that breaks the ability to grep for them.
89+
9990

10091
Chapter 3: Placing Braces and Spaces
10192

‎Documentation/DMA-API-HOWTO.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,13 @@ to use the dma_sync_*() interfaces.
613613
pass_to_upper_layers(cp->rx_buf);
614614
make_and_setup_new_rx_buf(cp);
615615
} else {
616-
/* Just sync the buffer and give it back
617-
* to the card.
616+
/* CPU should not write to
617+
* DMA_FROM_DEVICE-mapped area,
618+
* so dma_sync_single_for_device() is
619+
* not needed here. It would be required
620+
* for DMA_BIDIRECTIONAL mapping if
621+
* the memory was modified.
618622
*/
619-
dma_sync_single_for_device(&cp->dev,
620-
cp->rx_dma,
621-
cp->rx_len,
622-
DMA_FROM_DEVICE);
623623
give_rx_buf_to_card(cp);
624624
}
625625
}

‎Documentation/DocBook/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
*.dvi
99
*.log
1010
*.out
11-
media/
11+
*.png
12+
*.gif
13+
media-indices.tmpl
14+
media-entities.tmpl

‎Documentation/DocBook/Makefile‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
1414
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
1515
80211.xml debugobjects.xml sh.xml regulator.xml \
1616
alsa-driver-api.xml writing-an-alsa-driver.xml \
17-
tracepoint.xml media.xml drm.xml
17+
tracepoint.xml drm.xml media_api.xml
18+
19+
include $(srctree)/Documentation/DocBook/media/Makefile
1820

1921
###
2022
# The build process is as follows (targets):
@@ -32,7 +34,7 @@ PS_METHOD = $(prefer-db2x)
3234

3335
###
3436
# The targets that may be used.
35-
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
37+
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
3638

3739
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
3840
xmldocs: $(BOOKS)
@@ -45,27 +47,14 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
4547
pdfdocs: $(PDF)
4648

4749
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
48-
htmldocs: $(HTML) xmldoclinks
50+
htmldocs: $(HTML)
4951
$(call build_main_index)
5052
$(call build_images)
53+
$(call install_media_images)
5154

5255
MAN := $(patsubst %.xml, %.9, $(BOOKS))
5356
mandocs: $(MAN)
5457

55-
build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
56-
cp $(srctree)/Documentation/DocBook/dvb/*.png \
57-
$(srctree)/Documentation/DocBook/v4l/*.gif \
58-
$(objtree)/Documentation/DocBook/media/
59-
60-
xmldoclinks:
61-
ifneq ($(objtree),$(srctree))
62-
for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \
63-
rm -f $(objtree)/Documentation/DocBook/$$dep \
64-
&& ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \
65-
|| exit; \
66-
done
67-
endif
68-
6958
installmandocs: mandocs
7059
mkdir -p /usr/local/man/man9/
7160
install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
@@ -97,11 +86,11 @@ define rule_docproc
9786
) > $(dir $@).$(notdir $@).cmd
9887
endef
9988

100-
%.xml: %.tmpl xmldoclinks FORCE
89+
%.xml: %.tmpl FORCE
10190
$(call if_changed_rule,docproc)
10291

10392
###
104-
#Read in all saved dependency files
93+
#Read in all saved dependency files
10594
cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
10695

10796
ifneq ($(cmd_files),)
@@ -150,7 +139,7 @@ quiet_cmd_db2pdf = PDF $@
150139

151140
index = index.html
152141
main_idx = Documentation/DocBook/$(index)
153-
build_main_index = rm -rf $(main_idx) && \
142+
build_main_index = rm -rf $(main_idx); \
154143
echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
155144
echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
156145
cat $(HTML) >> $(main_idx)
@@ -242,7 +231,7 @@ clean-files := $(DOCBOOKS) \
242231

243232
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
244233

245-
cleandocs:
234+
cleandocs: cleanmediadocs
246235
$(Q)rm -f $(call objectify, $(clean-files))
247236
$(Q)rm -rf $(call objectify, $(clean-dirs))
248237

0 commit comments

Comments
 (0)