Merge branch 'for-next' into for-linus

2026-09-26 18:16:26 +00:00 · 2017-09-04 10:10:27 +02:00 · 2017-09-04 10:10:27 +02:00 · 2a32a4d9c9
commit 2a32a4d9c9
parent 1f7f51a631 39cdc62b1b
169 changed files with 1187 additions and 1074 deletions
--- a/include/sound/core.h
+++ b/include/sound/core.h
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
--- a/sound/aoa/codecs/tas.c
+++ b/sound/aoa/codecs/tas.c
--- a/sound/aoa/soundbus/i2sbus/pcm.c
+++ b/sound/aoa/soundbus/i2sbus/pcm.c
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
--- a/sound/core/control.c
+++ b/sound/core/control.c
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
--- a/sound/core/init.c
+++ b/sound/core/init.c
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
--- a/sound/firewire/bebob/bebob_focusrite.c
+++ b/sound/firewire/bebob/bebob_focusrite.c
--- a/sound/firewire/bebob/bebob_maudio.c
+++ b/sound/firewire/bebob/bebob_maudio.c
--- a/sound/firewire/bebob/bebob_terratec.c
+++ b/sound/firewire/bebob/bebob_terratec.c
--- a/sound/firewire/bebob/bebob_yamaha_terratec.c
+++ b/sound/firewire/bebob/bebob_yamaha_terratec.c
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
--- a/sound/firewire/fireface/ff-protocol-ff400.c
+++ b/sound/firewire/fireface/ff-protocol-ff400.c
--- a/sound/firewire/fireface/ff.c
+++ b/sound/firewire/fireface/ff.c
--- a/sound/firewire/fireface/ff.h
+++ b/sound/firewire/fireface/ff.h
--- a/sound/firewire/fireworks/fireworks_proc.c
+++ b/sound/firewire/fireworks/fireworks_proc.c
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
--- a/sound/firewire/motu/motu-midi.c
+++ b/sound/firewire/motu/motu-midi.c
--- a/sound/firewire/motu/motu-pcm.c
+++ b/sound/firewire/motu/motu-pcm.c
--- a/sound/firewire/motu/motu-protocol-v2.c
+++ b/sound/firewire/motu/motu-protocol-v2.c
--- a/sound/firewire/motu/motu-protocol-v3.c
+++ b/sound/firewire/motu/motu-protocol-v3.c
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
--- a/sound/firewire/motu/motu.h
+++ b/sound/firewire/motu/motu.h
--- a/sound/firewire/oxfw/oxfw-scs1x.c
+++ b/sound/firewire/oxfw/oxfw-scs1x.c
--- a/sound/firewire/tascam/tascam.c
+++ b/sound/firewire/tascam/tascam.c
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
--- a/sound/isa/msnd/msnd.c
+++ b/sound/isa/msnd/msnd.c
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
--- a/sound/isa/sb/emu8000_callback.c
+++ b/sound/isa/sb/emu8000_callback.c
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
--- a/sound/pci/asihpi/hpidebug.c
+++ b/sound/pci/asihpi/hpidebug.c
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
--- a/sound/pci/ctxfi/ctresource.c
+++ b/sound/pci/ctxfi/ctresource.c
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
--- a/Show more
+++ b/Show more