Skip to content

Commit 789e052

Browse files
tiwaitiwai
committed
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7 The biggest batch of fixes here is the Kirkwood DMA fixes, plus a couple of other small fixes.
2 parents 2ea3c6a + a6366c5 commit 789e052

File tree

175 files changed

+1952
-987
lines changed

Some content is hidden

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

175 files changed

+1952
-987
lines changed

‎Documentation/cgroups/memory.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ Note:
466466
5.3 swappiness
467467

468468
Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
469+
Please note that unlike the global swappiness, memcg knob set to 0
470+
really prevents from any swapping even if there is a swap storage
471+
available. This might lead to memcg OOM killer if there are no file
472+
pages to reclaim.
469473

470474
Following cgroups' swappiness can't be changed.
471475
- root cgroup (uses /proc/sys/vm/swappiness).

‎Documentation/filesystems/proc.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Table of Contents
3333
2 Modifying System Parameters
3434

3535
3 Per-Process Parameters
36-
3.1 /proc/<pid>/oom_score_adj - Adjust the oom-killer
36+
3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj - Adjust the oom-killer
3737
score
3838
3.2 /proc/<pid>/oom_score - Display current oom-killer score
3939
3.3 /proc/<pid>/io - Display the IO accounting fields
@@ -1320,10 +1320,10 @@ of the kernel.
13201320
CHAPTER 3: PER-PROCESS PARAMETERS
13211321
------------------------------------------------------------------------------
13221322

1323-
3.1 /proc/<pid>/oom_score_adj- Adjust the oom-killer score
1323+
3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj- Adjust the oom-killer score
13241324
--------------------------------------------------------------------------------
13251325

1326-
This file can be used to adjust the badness heuristic used to select which
1326+
These file can be used to adjust the badness heuristic used to select which
13271327
process gets killed in out of memory conditions.
13281328

13291329
The badness heuristic assigns a value to each candidate task ranging from 0
@@ -1361,6 +1361,12 @@ same system, cpuset, mempolicy, or memory controller resources to use at least
13611361
equivalent to discounting 50% of the task's allowed memory from being considered
13621362
as scoring against the task.
13631363

1364+
For backwards compatibility with previous kernels, /proc/<pid>/oom_adj may also
1365+
be used to tune the badness score. Its acceptable values range from -16
1366+
(OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17
1367+
(OOM_DISABLE) to disable oom killing entirely for that task. Its value is
1368+
scaled linearly with /proc/<pid>/oom_score_adj.
1369+
13641370
The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last
13651371
value set by a CAP_SYS_RESOURCE process. To reduce the value any lower
13661372
requires CAP_SYS_RESOURCE.
@@ -1375,7 +1381,9 @@ minimal amount of work.
13751381
-------------------------------------------------------------
13761382

13771383
This file can be used to check the current score used by the oom-killer is for
1378-
any given <pid>.
1384+
any given <pid>. Use it together with /proc/<pid>/oom_score_adj to tune which
1385+
process should be killed in an out-of-memory situation.
1386+
13791387

13801388
3.3 /proc/<pid>/io - Display the IO accounting fields
13811389
-------------------------------------------------------

‎Documentation/networking/netdev-features.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,4 @@ read the CRC recorded by the NIC on receipt of the packet.
164164
This requests that the NIC receive all possible frames, including errored
165165
frames (such as bad FCS, etc). This can be helpful when sniffing a link with
166166
bad packets on it. Some NICs may receive more packets if also put into normal
167-
PROMISC mdoe.
167+
PROMISC mode.

‎MAINTAINERS

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,16 +3598,58 @@ F: drivers/hid/hid-hyperv.c
35983598
F: drivers/net/hyperv/
35993599
F: drivers/staging/hv/
36003600

3601+
I2C OVER PARALLEL PORT
3602+
M: Jean Delvare <khali@linux-fr.org>
3603+
L: linux-i2c@vger.kernel.org
3604+
S: Maintained
3605+
F: Documentation/i2c/busses/i2c-parport
3606+
F: Documentation/i2c/busses/i2c-parport-light
3607+
F: drivers/i2c/busses/i2c-parport.c
3608+
F: drivers/i2c/busses/i2c-parport-light.c
3609+
3610+
I2C/SMBUS CONTROLLER DRIVERS FOR PC
3611+
M: Jean Delvare <khali@linux-fr.org>
3612+
L: linux-i2c@vger.kernel.org
3613+
S: Maintained
3614+
F: Documentation/i2c/busses/i2c-ali1535
3615+
F: Documentation/i2c/busses/i2c-ali1563
3616+
F: Documentation/i2c/busses/i2c-ali15x3
3617+
F: Documentation/i2c/busses/i2c-amd756
3618+
F: Documentation/i2c/busses/i2c-amd8111
3619+
F: Documentation/i2c/busses/i2c-i801
3620+
F: Documentation/i2c/busses/i2c-nforce2
3621+
F: Documentation/i2c/busses/i2c-piix4
3622+
F: Documentation/i2c/busses/i2c-sis5595
3623+
F: Documentation/i2c/busses/i2c-sis630
3624+
F: Documentation/i2c/busses/i2c-sis96x
3625+
F: Documentation/i2c/busses/i2c-via
3626+
F: Documentation/i2c/busses/i2c-viapro
3627+
F: drivers/i2c/busses/i2c-ali1535.c
3628+
F: drivers/i2c/busses/i2c-ali1563.c
3629+
F: drivers/i2c/busses/i2c-ali15x3.c
3630+
F: drivers/i2c/busses/i2c-amd756.c
3631+
F: drivers/i2c/busses/i2c-amd756-s4882.c
3632+
F: drivers/i2c/busses/i2c-amd8111.c
3633+
F: drivers/i2c/busses/i2c-i801.c
3634+
F: drivers/i2c/busses/i2c-isch.c
3635+
F: drivers/i2c/busses/i2c-nforce2.c
3636+
F: drivers/i2c/busses/i2c-nforce2-s4985.c
3637+
F: drivers/i2c/busses/i2c-piix4.c
3638+
F: drivers/i2c/busses/i2c-sis5595.c
3639+
F: drivers/i2c/busses/i2c-sis630.c
3640+
F: drivers/i2c/busses/i2c-sis96x.c
3641+
F: drivers/i2c/busses/i2c-via.c
3642+
F: drivers/i2c/busses/i2c-viapro.c
3643+
36013644
I2C/SMBUS STUB DRIVER
36023645
M: "Mark M. Hoffman" <mhoffman@lightlink.com>
36033646
L: linux-i2c@vger.kernel.org
36043647
S: Maintained
36053648
F: drivers/i2c/busses/i2c-stub.c
36063649

36073650
I2C SUBSYSTEM
3608-
M: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
3651+
M: Wolfram Sang <w.sang@pengutronix.de>
36093652
M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
3610-
M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
36113653
L: linux-i2c@vger.kernel.org
36123654
W: http://i2c.wiki.kernel.org/
36133655
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
@@ -3618,6 +3660,13 @@ F: drivers/i2c/
36183660
F: include/linux/i2c.h
36193661
F: include/linux/i2c-*.h
36203662

3663+
I2C-TAOS-EVM DRIVER
3664+
M: Jean Delvare <khali@linux-fr.org>
3665+
L: linux-i2c@vger.kernel.org
3666+
S: Maintained
3667+
F: Documentation/i2c/busses/i2c-taos-evm
3668+
F: drivers/i2c/busses/i2c-taos-evm.c
3669+
36213670
I2C-TINY-USB DRIVER
36223671
M: Till Harbaum <till@harbaum.org>
36233672
L: linux-i2c@vger.kernel.org
@@ -7210,6 +7259,14 @@ L: linux-xtensa@linux-xtensa.org
72107259
S: Maintained
72117260
F: arch/xtensa/
72127261

7262+
THERMAL
7263+
M: Zhang Rui <rui.zhang@intel.com>
7264+
L: linux-pm@vger.kernel.org
7265+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
7266+
S: Supported
7267+
F: drivers/thermal/
7268+
F: include/linux/thermal.h
7269+
72137270
THINKPAD ACPI EXTRAS DRIVER
72147271
M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
72157272
L: ibm-acpi-devel@lists.sourceforge.net
@@ -7887,13 +7944,6 @@ M: Roger Luethi <rl@hellgate.ch>
78877944
S: Maintained
78887945
F: drivers/net/ethernet/via/via-rhine.c
78897946

7890-
VIAPRO SMBUS DRIVER
7891-
M: Jean Delvare <khali@linux-fr.org>
7892-
L: linux-i2c@vger.kernel.org
7893-
S: Maintained
7894-
F: Documentation/i2c/busses/i2c-viapro
7895-
F: drivers/i2c/busses/i2c-viapro.c
7896-
78977947
VIA SD/MMC CARD CONTROLLER DRIVER
78987948
M: Bruce Chang <brucechang@via.com.tw>
78997949
M: Harald Welte <HaraldWelte@viatech.com>

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 7
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Terrified Chipmunk
66

77
# *DOCUMENTATION*

‎arch/arm/boot/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y)
3333

3434
$(obj)/xipImage: vmlinux FORCE
3535
$(call if_changed,objcopy)
36-
$(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'
36+
@$(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'
3737

3838
$(obj)/Image $(obj)/zImage: FORCE
3939
@echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
@@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE
4848

4949
$(obj)/Image: vmlinux FORCE
5050
$(call if_changed,objcopy)
51-
$(kecho) ' Kernel: $@ is ready'
51+
@$(kecho) ' Kernel: $@ is ready'
5252

5353
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
5454
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
5555

5656
$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
5757
$(call if_changed,objcopy)
58-
$(kecho) ' Kernel: $@ is ready'
58+
@$(kecho) ' Kernel: $@ is ready'
5959

6060
endif
6161

@@ -90,15 +90,15 @@ fi
9090
$(obj)/uImage: $(obj)/zImage FORCE
9191
@$(check_for_multiple_loadaddr)
9292
$(call if_changed,uimage)
93-
$(kecho) ' Image $@ is ready'
93+
@$(kecho) ' Image $@ is ready'
9494

9595
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
9696
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
9797
@:
9898

9999
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE
100100
$(call if_changed,objcopy)
101-
$(kecho) ' Kernel: $@ is ready'
101+
@$(kecho) ' Kernel: $@ is ready'
102102

103103
PHONY += initrd FORCE
104104
initrd:

‎arch/arm/boot/dts/tegra30.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373

7474
pinmux: pinmux {
7575
compatible = "nvidia,tegra30-pinmux";
76-
reg = <0x70000868 0xd0 /* Pad control registers */
77-
0x70003000 0x3e0>; /* Mux registers */
76+
reg = <0x70000868 0xd4 /* Pad control registers */
77+
0x70003000 0x3e4>; /* Mux registers */
7878
};
7979

8080
serial@70006000 {

‎arch/arm/mach-at91/at91rm9200_devices.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
6868

6969
/* Enable overcurrent notification */
7070
for (i = 0; i < data->ports; i++) {
71-
if (data->overcurrent_pin[i])
71+
if (gpio_is_valid(data->overcurrent_pin[i]))
7272
at91_set_gpio_input(data->overcurrent_pin[i], 1);
7373
}
7474

‎arch/arm/mach-at91/at91sam9260_devices.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
7272

7373
/* Enable overcurrent notification */
7474
for (i = 0; i < data->ports; i++) {
75-
if (data->overcurrent_pin[i])
75+
if (gpio_is_valid(data->overcurrent_pin[i]))
7676
at91_set_gpio_input(data->overcurrent_pin[i], 1);
7777
}
7878

‎arch/arm/mach-at91/at91sam9261_devices.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
7272

7373
/* Enable overcurrent notification */
7474
for (i = 0; i < data->ports; i++) {
75-
if (data->overcurrent_pin[i])
75+
if (gpio_is_valid(data->overcurrent_pin[i]))
7676
at91_set_gpio_input(data->overcurrent_pin[i], 1);
7777
}
7878

0 commit comments

Comments
 (0)