Merge branch 'for-next' into for-linus

For 4.12 merge.
2026-09-28 19:20:30 +00:00 · 2017-05-02 08:24:42 +02:00 · 2017-05-02 08:24:42 +02:00 · d7dc450d5a
commit d7dc450d5a
parent d4a2fbcee0 0997e378be
104 changed files with 6475 additions and 737 deletions
--- a/Documentation/sound/hd-audio/notes.rst
+++ b/Documentation/sound/hd-audio/notes.rst
--- a/include/sound/hda_register.h
+++ b/include/sound/hda_register.h
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
--- a/include/uapi/sound/firewire.h
+++ b/include/uapi/sound/firewire.h
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
--- a/sound/firewire/Makefile
+++ b/sound/firewire/Makefile
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
--- a/sound/firewire/amdtp-stream.h
+++ b/sound/firewire/amdtp-stream.h
--- a/sound/firewire/bebob/bebob_command.c
+++ b/sound/firewire/bebob/bebob_command.c
--- a/sound/firewire/digi00x/amdtp-dot.c
+++ b/sound/firewire/digi00x/amdtp-dot.c
--- a/sound/firewire/digi00x/digi00x-midi.c
+++ b/sound/firewire/digi00x/digi00x-midi.c
--- a/sound/firewire/digi00x/digi00x-transaction.c
+++ b/sound/firewire/digi00x/digi00x-transaction.c
--- a/sound/firewire/digi00x/digi00x.c
+++ b/sound/firewire/digi00x/digi00x.c
--- a/sound/firewire/digi00x/digi00x.h
+++ b/sound/firewire/digi00x/digi00x.h
--- a/sound/firewire/fcp.c
+++ b/sound/firewire/fcp.c
--- a/sound/firewire/fireface/Makefile
+++ b/sound/firewire/fireface/Makefile
--- a/sound/firewire/fireface/amdtp-ff.c
+++ b/sound/firewire/fireface/amdtp-ff.c
--- a/sound/firewire/fireface/ff-hwdep.c
+++ b/sound/firewire/fireface/ff-hwdep.c
--- a/sound/firewire/fireface/ff-midi.c
+++ b/sound/firewire/fireface/ff-midi.c
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
--- a/sound/firewire/fireface/ff-proc.c
+++ b/sound/firewire/fireface/ff-proc.c
--- a/sound/firewire/fireface/ff-protocol-ff400.c
+++ b/sound/firewire/fireface/ff-protocol-ff400.c
--- a/sound/firewire/fireface/ff-stream.c
+++ b/sound/firewire/fireface/ff-stream.c
--- a/sound/firewire/fireface/ff-transaction.c
+++ b/sound/firewire/fireface/ff-transaction.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/lib.c
+++ b/sound/firewire/lib.c
--- a/sound/firewire/lib.h
+++ b/sound/firewire/lib.h
--- a/sound/firewire/motu/Makefile
+++ b/sound/firewire/motu/Makefile
--- a/sound/firewire/motu/amdtp-motu-trace.h
+++ b/sound/firewire/motu/amdtp-motu-trace.h
--- a/sound/firewire/motu/amdtp-motu.c
+++ b/sound/firewire/motu/amdtp-motu.c
--- a/sound/firewire/motu/motu-hwdep.c
+++ b/sound/firewire/motu/motu-hwdep.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-proc.c
+++ b/sound/firewire/motu/motu-proc.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-transaction.c
+++ b/sound/firewire/motu/motu-transaction.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-command.c
+++ b/sound/firewire/oxfw/oxfw-command.c
--- a/sound/firewire/tascam/tascam-midi.c
+++ b/sound/firewire/tascam/tascam-midi.c
--- a/sound/firewire/tascam/tascam-transaction.c
+++ b/sound/firewire/tascam/tascam-transaction.c
--- a/sound/firewire/tascam/tascam.h
+++ b/sound/firewire/tascam/tascam.h
--- a/sound/hda/ext/hdac_ext_controller.c
+++ b/sound/hda/ext/hdac_ext_controller.c
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
--- a/sound/hda/hdac_stream.c
+++ b/sound/hda/hdac_stream.c
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.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_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.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/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
--- a/sound/pci/lola/lola_mixer.c
+++ b/sound/pci/lola/lola_mixer.c
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
--- a/sound/pci/mixart/mixart_mixer.c
+++ b/sound/pci/mixart/mixart_mixer.c
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
--- a/sound/pci/pcxhr/pcxhr_mix22.c
+++ b/sound/pci/pcxhr/pcxhr_mix22.c
--- a/sound/pci/pcxhr/pcxhr_mixer.c
+++ b/sound/pci/pcxhr/pcxhr_mixer.c
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
--- a/Show more
+++ b/Show more