Skip to content

Commit d26fad5

Browse files
author
Ingo Molnar
committed
Merge tag 'v3.16-rc5' into sched/core, to refresh the branch before applying bigger tree-wide changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents e720fff + 1795cd9 commit d26fad5

File tree

1,117 files changed

+13905
-8132
lines changed

Some content is hidden

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

1,117 files changed

+13905
-8132
lines changed

‎CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
Linus
1010
----------
1111

12+
M: Matt Mackal
13+
E: mpm@selenic.com
14+
D: SLOB slab allocator
15+
1216
N: Matti Aarnio
1317
E: mea@nic.funet.fi
1418
D: Alpha systems hacking, IPv6 and other network related stuff

‎Documentation/Changes

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,9 @@ that is possible.
280280
mcelog
281281
------
282282

283-
In Linux 2.6.31+ the i386 kernel needs to run the mcelog utility
284-
as a regular cronjob similar to the x86-64 kernel to process and log
285-
machine check events when CONFIG_X86_NEW_MCE is enabled. Machine check
286-
events are errors reported by the CPU. Processing them is strongly encouraged.
287-
All x86-64 kernels since 2.6.4 require the mcelog utility to
288-
process machine checks.
283+
On x86 kernels the mcelog utility is needed to process and log machine check
284+
events when CONFIG_X86_MCE is enabled. Machine check events are errors reported
285+
by the CPU. Processing them is strongly encouraged.
289286

290287
Getting updated software
291288
========================

‎Documentation/DocBook/gadget.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ hardware level details could be very different.
708708

709709
<para>Systems need specialized hardware support to implement OTG,
710710
notably including a special <emphasis>Mini-AB</emphasis> jack
711-
and associated transciever to support <emphasis>Dual-Role</emphasis>
711+
and associated transceiver to support <emphasis>Dual-Role</emphasis>
712712
operation:
713713
they can act either as a host, using the standard
714714
Linux-USB host side driver stack,

‎Documentation/DocBook/genericirq.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<para>
183183
Each interrupt is described by an interrupt descriptor structure
184184
irq_desc. The interrupt is referenced by an 'unsigned int' numeric
185-
value which selects the corresponding interrupt decription structure
185+
value which selects the corresponding interrupt description structure
186186
in the descriptor structures array.
187187
The descriptor structure contains status information and pointers
188188
to the interrupt flow method and the interrupt chip structure
@@ -470,7 +470,7 @@ if (desc->irq_data.chip->irq_eoi)
470470
<para>
471471
To avoid copies of identical implementations of IRQ chips the
472472
core provides a configurable generic interrupt chip
473-
implementation. Developers should check carefuly whether the
473+
implementation. Developers should check carefully whether the
474474
generic chip fits their needs before implementing the same
475475
functionality slightly differently themselves.
476476
</para>

‎Documentation/DocBook/kernel-locking.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@ as it would be on UP.
17601760
</para>
17611761

17621762
<para>
1763-
There is a furthur optimization possible here: remember our original
1763+
There is a further optimization possible here: remember our original
17641764
cache code, where there were no reference counts and the caller simply
17651765
held the lock whenever using the object? This is still possible: if
17661766
you hold the lock, no one can delete the object, so you don't need to

‎Documentation/DocBook/libata.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ and other resources, etc.
677677

678678
<listitem>
679679
<para>
680-
ATA_QCFLAG_ACTIVE is clared from qc->flags.
680+
ATA_QCFLAG_ACTIVE is cleared from qc->flags.
681681
</para>
682682
</listitem>
683683

@@ -708,7 +708,7 @@ and other resources, etc.
708708

709709
<listitem>
710710
<para>
711-
qc->waiting is claread &amp; completed (in that order).
711+
qc->waiting is cleared &amp; completed (in that order).
712712
</para>
713713
</listitem>
714714

@@ -1163,7 +1163,7 @@ and other resources, etc.
11631163

11641164
<para>
11651165
Once sense data is acquired, this type of errors can be
1166-
handled similary to other SCSI errors. Note that sense data
1166+
handled similarly to other SCSI errors. Note that sense data
11671167
may indicate ATA bus error (e.g. Sense Key 04h HARDWARE ERROR
11681168
&amp;&amp; ASC/ASCQ 47h/00h SCSI PARITY ERROR). In such
11691169
cases, the error should be considered as an ATA bus error and

‎Documentation/DocBook/media/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
202202

203203
$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
204204
@$($(quiet)gen_xml)
205-
@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
206-
@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
205+
@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)
206+
@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)
207207

208208
$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
209209
@$($(quiet)gen_xml)

‎Documentation/DocBook/media_api.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
several digital tv standards. While it is called as DVB API,
6969
in fact it covers several different video standards including
7070
DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated
71-
to documment support also for DVB-S2, ISDB-T and ISDB-S.</para>
71+
to document support also for DVB-S2, ISDB-T and ISDB-S.</para>
7272
<para>The third part covers the Remote Controller API.</para>
7373
<para>The fourth part covers the Media Controller API.</para>
7474
<para>For additional information and for the latest development code,

‎Documentation/DocBook/mtdnand.tmpl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<listitem><para>
9292
[MTD Interface]</para><para>
9393
These functions provide the interface to the MTD kernel API.
94-
They are not replacable and provide functionality
94+
They are not replaceable and provide functionality
9595
which is complete hardware independent.
9696
</para></listitem>
9797
<listitem><para>
@@ -100,14 +100,14 @@
100100
</para></listitem>
101101
<listitem><para>
102102
[GENERIC]</para><para>
103-
Generic functions are not replacable and provide functionality
103+
Generic functions are not replaceable and provide functionality
104104
which is complete hardware independent.
105105
</para></listitem>
106106
<listitem><para>
107107
[DEFAULT]</para><para>
108108
Default functions provide hardware related functionality which is suitable
109109
for most of the implementations. These functions can be replaced by the
110-
board driver if neccecary. Those functions are called via pointers in the
110+
board driver if necessary. Those functions are called via pointers in the
111111
NAND chip description structure. The board driver can set the functions which
112112
should be replaced by board dependent functions before calling nand_scan().
113113
If the function pointer is NULL on entry to nand_scan() then the pointer
@@ -264,7 +264,7 @@ static void board_hwcontrol(struct mtd_info *mtd, int cmd)
264264
is set up nand_scan() is called. This function tries to
265265
detect and identify then chip. If a chip is found all the
266266
internal data fields are initialized accordingly.
267-
The structure(s) have to be zeroed out first and then filled with the neccecary
267+
The structure(s) have to be zeroed out first and then filled with the necessary
268268
information about the device.
269269
</para>
270270
<programlisting>
@@ -327,7 +327,7 @@ module_init(board_init);
327327
<sect1 id="Exit_function">
328328
<title>Exit function</title>
329329
<para>
330-
The exit function is only neccecary if the driver is
330+
The exit function is only necessary if the driver is
331331
compiled as a module. It releases all resources which
332332
are held by the chip driver and unregisters the partitions
333333
in the MTD layer.
@@ -494,7 +494,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
494494
in this case. See rts_from4.c and diskonchip.c for
495495
implementation reference. In those cases we must also
496496
use bad block tables on FLASH, because the ECC layout is
497-
interferring with the bad block marker positions.
497+
interfering with the bad block marker positions.
498498
See bad block table support for details.
499499
</para>
500500
</sect2>
@@ -542,7 +542,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
542542
<para>
543543
nand_scan() calls the function nand_default_bbt().
544544
nand_default_bbt() selects appropriate default
545-
bad block table desriptors depending on the chip information
545+
bad block table descriptors depending on the chip information
546546
which was retrieved by nand_scan().
547547
</para>
548548
<para>
@@ -554,7 +554,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
554554
<sect2 id="Flash_based_tables">
555555
<title>Flash based tables</title>
556556
<para>
557-
It may be desired or neccecary to keep a bad block table in FLASH.
557+
It may be desired or necessary to keep a bad block table in FLASH.
558558
For AG-AND chips this is mandatory, as they have no factory marked
559559
bad blocks. They have factory marked good blocks. The marker pattern
560560
is erased when the block is erased to be reused. So in case of
@@ -565,10 +565,10 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
565565
of the blocks.
566566
</para>
567567
<para>
568-
The blocks in which the tables are stored are procteted against
568+
The blocks in which the tables are stored are protected against
569569
accidental access by marking them bad in the memory bad block
570570
table. The bad block table management functions are allowed
571-
to circumvernt this protection.
571+
to circumvent this protection.
572572
</para>
573573
<para>
574574
The simplest way to activate the FLASH based bad block table support
@@ -592,7 +592,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
592592
User defined tables are created by filling out a
593593
nand_bbt_descr structure and storing the pointer in the
594594
nand_chip structure member bbt_td before calling nand_scan().
595-
If a mirror table is neccecary a second structure must be
595+
If a mirror table is necessary a second structure must be
596596
created and a pointer to this structure must be stored
597597
in bbt_md inside the nand_chip structure. If the bbt_md
598598
member is set to NULL then only the main table is used
@@ -666,7 +666,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
666666
<para>
667667
For automatic placement some blocks must be reserved for
668668
bad block table storage. The number of reserved blocks is defined
669-
in the maxblocks member of the babd block table description structure.
669+
in the maxblocks member of the bad block table description structure.
670670
Reserving 4 blocks for mirrored tables should be a reasonable number.
671671
This also limits the number of blocks which are scanned for the bad
672672
block table ident pattern.
@@ -1068,11 +1068,11 @@ in this page</entry>
10681068
<chapter id="filesystems">
10691069
<title>Filesystem support</title>
10701070
<para>
1071-
The NAND driver provides all neccecary functions for a
1071+
The NAND driver provides all necessary functions for a
10721072
filesystem via the MTD interface.
10731073
</para>
10741074
<para>
1075-
Filesystems must be aware of the NAND pecularities and
1075+
Filesystems must be aware of the NAND peculiarities and
10761076
restrictions. One major restrictions of NAND Flash is, that you cannot
10771077
write as often as you want to a page. The consecutive writes to a page,
10781078
before erasing it again, are restricted to 1-3 writes, depending on the
@@ -1222,7 +1222,7 @@ in this page</entry>
12221222
#define NAND_BBT_VERSION 0x00000100
12231223
/* Create a bbt if none axists */
12241224
#define NAND_BBT_CREATE 0x00000200
1225-
/* Write bbt if neccecary */
1225+
/* Write bbt if necessary */
12261226
#define NAND_BBT_WRITE 0x00001000
12271227
/* Read and write back block contents when writing bbt */
12281228
#define NAND_BBT_SAVECONTENT 0x00002000

‎Documentation/DocBook/regulator.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
release regulators. Functions are
156156
provided to <link linkend='API-regulator-enable'>enable</link>
157157
and <link linkend='API-regulator-disable'>disable</link> the
158-
reguator and to get and set the runtime parameters of the
158+
regulator and to get and set the runtime parameters of the
159159
regulator.
160160
</para>
161161
<para>

‎Documentation/DocBook/uio-howto.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,10 +766,10 @@ framework to set up sysfs files for this region. Simply leave it alone.
766766
<para>
767767
The dynamic memory regions will be allocated when the UIO device file,
768768
<varname>/dev/uioX</varname> is opened.
769-
Simiar to static memory resources, the memory region information for
769+
Similar to static memory resources, the memory region information for
770770
dynamic regions is then visible via sysfs at
771771
<varname>/sys/class/uio/uioX/maps/mapY/*</varname>.
772-
The dynmaic memory regions will be freed when the UIO device file is
772+
The dynamic memory regions will be freed when the UIO device file is
773773
closed. When no processes are holding the device file open, the address
774774
returned to userspace is ~0.
775775
</para>

‎Documentation/DocBook/usb.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153

154154
<listitem><para>The Linux USB API supports synchronous calls for
155155
control and bulk messages.
156-
It also supports asynchnous calls for all kinds of data transfer,
156+
It also supports asynchronous calls for all kinds of data transfer,
157157
using request structures called "URBs" (USB Request Blocks).
158158
</para></listitem>
159159

‎Documentation/DocBook/writing-an-alsa-driver.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5696,7 +5696,7 @@ struct _snd_pcm_runtime {
56965696
suspending the PCM operations via
56975697
<function>snd_pcm_suspend_all()</function> or
56985698
<function>snd_pcm_suspend()</function>. It means that the PCM
5699-
streams are already stoppped when the register snapshot is
5699+
streams are already stopped when the register snapshot is
57005700
taken. But, remember that you don't have to restart the PCM
57015701
stream in the resume callback. It'll be restarted via
57025702
trigger call with <constant>SNDRV_PCM_TRIGGER_RESUME</constant>

‎Documentation/accounting/getdelays.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ int main(int argc, char *argv[])
314314
break;
315315
case 'm':
316316
strncpy(cpumask, optarg, sizeof(cpumask));
317+
cpumask[sizeof(cpumask) - 1] = '\0';
317318
maskset = 1;
318319
printf("cpumask %s maskset %d\n", cpumask, maskset);
319320
break;

‎Documentation/cpu-freq/intel-pstate.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ New sysfs files for controlling P state selection have been added to
1515
/sys/devices/system/cpu/intel_pstate/
1616

1717
max_perf_pct: limits the maximum P state that will be requested by
18-
the driver stated as a percentage of the available performance.
18+
the driver stated as a percentage of the available performance. The
19+
available (P states) performance may be reduced by the no_turbo
20+
setting described below.
1921

2022
min_perf_pct: limits the minimum P state that will be requested by
21-
the driver stated as a percentage of the available performance.
23+
the driver stated as a percentage of the max (non-turbo)
24+
performance level.
2225

2326
no_turbo: limits the driver to selecting P states below the turbo
2427
frequency range.

‎Documentation/devicetree/bindings/arm/armada-38x.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,15 @@ following property:
66

77
Required root node property:
88

9-
- compatible: must contain either "marvell,armada380" or
10-
"marvell,armada385" depending on the variant of the SoC being used.
9+
- compatible: must contain "marvell,armada380"
10+
11+
In addition, boards using the Marvell Armada 385 SoC shall have the
12+
following property before the previous one:
13+
14+
Required root node property:
15+
16+
compatible: must contain "marvell,armada385"
17+
18+
Example:
19+
20+
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

‎Documentation/devicetree/bindings/arm/exynos/power_domain.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ Required Properties:
99
- reg: physical base address of the controller and length of memory mapped
1010
region.
1111

12+
Optional Properties:
13+
- clocks: List of clock handles. The parent clocks of the input clocks to the
14+
devices in this power domain are set to oscclk before power gating
15+
and restored back after powering on a domain. This is required for
16+
all domains which are powered on and off and not required for unused
17+
domains.
18+
- clock-names: The following clocks can be specified:
19+
- oscclk: Oscillator clock.
20+
- pclkN, clkN: Pairs of parent of input clock and input clock to the
21+
devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
22+
are supported currently.
23+
1224
Node of a device using power domains must have a samsung,power-domain property
1325
defined with a phandle to respective power domain.
1426

@@ -19,6 +31,14 @@ Example:
1931
reg = <0x10023C00 0x10>;
2032
};
2133

34+
mfc_pd: power-domain@10044060 {
35+
compatible = "samsung,exynos4210-pd";
36+
reg = <0x10044060 0x20>;
37+
clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK333>,
38+
<&clock CLK_MOUT_USER_ACLK333>;
39+
clock-names = "oscclk", "pclk0", "clk0";
40+
};
41+
2242
Example of the node using power domain:
2343

2444
node {

‎Documentation/devicetree/bindings/arm/l2cc.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Optional properties:
4040
- arm,filter-ranges : <start length> Starting address and length of window to
4141
filter. Addresses in the filter window are directed to the M1 port. Other
4242
addresses will go to the M0 port.
43+
- arm,io-coherent : indicates that the system is operating in an hardware
44+
I/O coherent mode. Valid only when the arm,pl310-cache compatible
45+
string is used.
4346
- interrupts : 1 combined interrupt.
4447
- cache-id-part: cache id part number to be used if it is not present
4548
on hardware

‎Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ adc@12D10000 {
4848

4949
/* NTC thermistor is a hwmon device */
5050
ncp15wb473@0 {
51-
compatible = "ntc,ncp15wb473";
51+
compatible = "murata,ncp15wb473";
5252
pullup-uv = <1800000>;
5353
pullup-ohm = <47000>;
5454
pulldown-ohm = <0>;

0 commit comments

Comments
 (0)