Merge branch 'master' into latest

backports/backports.txt

@@ -28,6 +28,9 @@ add drx39xxj.patch
 add ccs.patch
 add rc-cec.patch
 
+[6.5.1023]
+add v6.5_pcm_copy.patch
+
 [6.4.1023]
 add v6.4_pin_user_pages.patch
 

backports/v6.2_probe.patch

@@ -1129,6 +1129,19 @@ index b5948759342e..35663c10fcd9 100644
  	.remove = og01a1b_remove,
  };
  
+diff --git a/drivers/media/i2c/ov01a10.c b/drivers/media/i2c/ov01a10.c
+index bbd5740d2280..06a1022faea7 100644
+--- a/drivers/media/i2c/ov01a10.c
++++ b/drivers/media/i2c/ov01a10.c
+@@ -939,7 +939,7 @@ static struct i2c_driver ov01a10_i2c_driver = {
+ 		.name = "ov01a10",
+ 		.acpi_match_table = ACPI_PTR(ov01a10_acpi_ids),
+ 	},
+-	.probe = ov01a10_probe,
++	.probe_new = ov01a10_probe,
+ 	.remove = ov01a10_remove,
+ };
+ 
 diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c
 index 741d977a76f3..9fbef9c5a52f 100644
 --- a/drivers/media/i2c/ov02a10.c

backports/v6.5_pcm_copy.patch

@@ -0,0 +1,65 @@
+diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
+index 1db9f40ee0c0..6cebad665565 100644
+--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
++++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
+@@ -204,9 +204,9 @@ static snd_pcm_uframes_t snd_solo_pcm_pointer(struct snd_pcm_substream *ss)
+ 	return idx * G723_FRAMES_PER_PAGE;
+ }
+ 
+-static int snd_solo_pcm_copy(struct snd_pcm_substream *ss, int channel,
+-			     unsigned long pos, struct iov_iter *dst,
+-			     unsigned long count)
++static int snd_solo_pcm_copy_user(struct snd_pcm_substream *ss, int channel,
++				  unsigned long pos, void __user *dst,
++				  unsigned long count)
+ {
+ 	struct solo_snd_pcm *solo_pcm = snd_pcm_substream_chip(ss);
+ 	struct solo_dev *solo_dev = solo_pcm->solo_dev;
+@@ -223,9 +223,35 @@ static int snd_solo_pcm_copy(struct snd_pcm_substream *ss, int channel,
+ 		if (err)
+ 			return err;
+ 
+-		if (copy_to_iter(solo_pcm->g723_buf, G723_PERIOD_BYTES, dst) !=
+-		    G723_PERIOD_BYTES)
++		if (copy_to_user(dst, solo_pcm->g723_buf, G723_PERIOD_BYTES))
+ 			return -EFAULT;
++		dst += G723_PERIOD_BYTES;
++	}
++
++	return 0;
++}
++
++static int snd_solo_pcm_copy_kernel(struct snd_pcm_substream *ss, int channel,
++				    unsigned long pos, void *dst,
++				    unsigned long count)
++{
++	struct solo_snd_pcm *solo_pcm = snd_pcm_substream_chip(ss);
++	struct solo_dev *solo_dev = solo_pcm->solo_dev;
++	int err, i;
++
++	for (i = 0; i < (count / G723_FRAMES_PER_PAGE); i++) {
++		int page = (pos / G723_FRAMES_PER_PAGE) + i;
++
++		err = solo_p2m_dma_t(solo_dev, 0, solo_pcm->g723_dma,
++				     SOLO_G723_EXT_ADDR(solo_dev) +
++				     (page * G723_PERIOD_BLOCK) +
++				     (ss->number * G723_PERIOD_BYTES),
++				     G723_PERIOD_BYTES, 0, 0);
++		if (err)
++			return err;
++
++		memcpy(dst, solo_pcm->g723_buf, G723_PERIOD_BYTES);
++		dst += G723_PERIOD_BYTES;
+ 	}
+ 
+ 	return 0;
+@@ -237,7 +263,8 @@ static const struct snd_pcm_ops snd_solo_pcm_ops = {
+ 	.prepare = snd_solo_pcm_prepare,
+ 	.trigger = snd_solo_pcm_trigger,
+ 	.pointer = snd_solo_pcm_pointer,
+-	.copy = snd_solo_pcm_copy,
++	.copy_user = snd_solo_pcm_copy_user,
++	.copy_kernel = snd_solo_pcm_copy_kernel,
+ };
+ 
+ static int snd_solo_capture_volume_info(struct snd_kcontrol *kcontrol,

v4l/scripts/make_config_compat.pl

@@ -142,7 +142,7 @@ sub check_other_dependencies()
 	check_files_for_func("sched_set_fifo", "NEED_SCHED_SET_FIFO", "include/linux/sched.h");
 	check_files_for_func("dma_map_sgtable", "NEED_DMA_MAP_SGTABLE", "include/linux/dma-mapping.h");
 	check_files_for_func("in_compat_syscall", "NEED_IN_COMPAT_SYSCALL", "include/linux/compat.h");
-	check_files_for_func("dev_err_probe", "NEED_DEV_ERR_PROBE", "include/linux/device.h");
+	check_files_for_func("dev_err_probe", "NEED_DEV_ERR_PROBE", "include/linux/device.h", "include/linux/dev_printk.h");
 	check_files_for_func("pm_runtime_resume_and_get", "NEED_PM_RUNTIME_RESUME_AND_GET", "include/linux/pm_runtime.h");
 	check_files_for_func("vma_lookup", "NEED_VMA_LOOKUP", "include/linux/mm.h");
 	check_files_for_func("HZ_PER_MHZ", "NEED_HZ_PER_MHZ", "include/linux/units.h");