Merge branch 'for-next' into for-linus (5fa87a08) · Commits · git / linux-net

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -24951,6 +24951,12 @@ F: mm/zpool.c
		F: mm/zswap.c
		F: tools/testing/selftests/cgroup/test_zswap.c

		SENARYTECH AUDIO CODEC DRIVER
		M: bo liu <bo.liu@senarytech.com>
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
		F: sound/pci/hda/patch_senarytech.c

		THE REST
		M: Linus Torvalds <torvalds@linux-foundation.org>
		L: linux-kernel@vger.kernel.org

+1 −0

Original line number	Diff line number	Diff line
		@@ -3112,6 +3112,7 @@
		#define PCI_DEVICE_ID_INTEL_HDA_LNL_P 0xa828
		#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152
		#define PCI_DEVICE_ID_INTEL_HDA_BMG 0xe2f7
		#define PCI_DEVICE_ID_INTEL_HDA_PTL 0xe428
		#define PCI_DEVICE_ID_INTEL_HDA_CML_R 0xf0c8
		#define PCI_DEVICE_ID_INTEL_HDA_RKL_S 0xf1c8

+14 −2

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ struct snd_pcm_ops {
		#define SNDRV_PCM_IOCTL1_CHANNEL_INFO 2
		/* 3 is absent slot. */
		#define SNDRV_PCM_IOCTL1_FIFO_SIZE 4
		#define SNDRV_PCM_IOCTL1_SYNC_ID 5

		#define SNDRV_PCM_TRIGGER_STOP 0
		#define SNDRV_PCM_TRIGGER_START 1
		@@ -401,7 +402,7 @@ struct snd_pcm_runtime {
		snd_pcm_uframes_t silence_start; /* starting pointer to silence area */
		snd_pcm_uframes_t silence_filled; /* already filled part of silence area */

		union snd_pcm_sync_id sync; /* hardware synchronization ID */
		bool std_sync_id; /* hardware synchronization - standard per card ID */

		/* -- mmap -- */
		struct snd_pcm_mmap_status *status;
		@@ -1155,7 +1156,18 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int

		void snd_pcm_set_ops(struct snd_pcm * pcm, int direction,
		const struct snd_pcm_ops *ops);
		void snd_pcm_set_sync(struct snd_pcm_substream *substream);
		void snd_pcm_set_sync_per_card(struct snd_pcm_substream substream, struct snd_pcm_hw_params params,
		const unsigned char *id, unsigned int len);
		/**
		* snd_pcm_set_sync - set the PCM sync id
		* @substream: the pcm substream
		*
		* Use the default PCM sync identifier for the specific card.
		*/
		static inline void snd_pcm_set_sync(struct snd_pcm_substream *substream)
		{
		substream->runtime->std_sync_id = true;
		}
		int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
		unsigned int cmd, void *arg);
		void snd_pcm_period_elapsed_under_stream_lock(struct snd_pcm_substream *substream);

+4 −3

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		#include <sound/asound.h>

		/** version of the sequencer */
		#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 3)
		#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 4)

		/**
		* definition of sequencer event types
		@@ -523,11 +523,12 @@ struct snd_seq_queue_status {
		/* queue tempo */
		struct snd_seq_queue_tempo {
		int queue; /* sequencer queue */
		unsigned int tempo; /* current tempo, us/tick */
		unsigned int tempo; /* current tempo, us/tick (or different time-base below) */
		int ppq; /* time resolution, ticks/quarter */
		unsigned int skew_value; /* queue skew */
		unsigned int skew_base; /* queue skew base */
		char reserved[24]; /* for the future */
		unsigned short tempo_base; /* tempo base in nsec unit; either 10 or 1000 */
		char reserved[22]; /* for the future */
		};

+5 −4

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image {
		* *
		*****************************************************************************/

		#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17)
		#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18)

		typedef unsigned long snd_pcm_uframes_t;
		typedef signed long snd_pcm_sframes_t;
		@@ -334,7 +334,7 @@ union snd_pcm_sync_id {
		unsigned char id[16];
		unsigned short id16[8];
		unsigned int id32[4];
		};
		} __attribute__((deprecated));

		struct snd_pcm_info {
		unsigned int device; /* RO/WR (control): device number */
		@@ -348,7 +348,7 @@ struct snd_pcm_info {
		int dev_subclass; /* SNDRV_PCM_SUBCLASS_* */
		unsigned int subdevices_count;
		unsigned int subdevices_avail;
		union snd_pcm_sync_id sync; /* hardware synchronization ID */
		unsigned char pad1[16]; /* was: hardware synchronization ID */
		unsigned char reserved[64]; /* reserved for future... */
		};

		@@ -420,7 +420,8 @@ struct snd_pcm_hw_params {
		unsigned int rate_num; /* R: rate numerator */
		unsigned int rate_den; /* R: rate denominator */
		snd_pcm_uframes_t fifo_size; /* R: chip FIFO size in frames */
		unsigned char reserved[64]; /* reserved for future */
		unsigned char sync[16]; /* R: synchronization ID (perfect sync - one clock source) */
		unsigned char reserved[48]; /* reserved for future */
		};

		enum {