brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux-brain/drivers/misc/mic
History
Andrey Zhizhikin b5636ee381 This is the 5.4.73 stable release 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl+ahE8ACgkQONu9yGCS
 aT4j1A/9HzkKKoqZ2vXYQ1/uEnUqZech9ly1KxpNTBrSZYAtx3MaWY7tGDEx2BqD
 y6iw9x4MymhHEbpwLg6YmmdWuMQLNNYJGoyLiPJgWhkE4c7zHadhNz1DcPEI8F7z
 bSlUJ3Oebr8gzv0FvUmeVXw7Z2EuOqM1zGgTAZfnKY3DkYHbLnrzUJ4AiI8TNeba
 pPIhjfIJ1TvhF+s5ggf2m8OtSWLZ0doCWCPmCFe2WyERX2WYCzPgsm0yL7L7oXME
 ZqWpOcClBsiYekBNcZ4kxozhJtArCnv24n9VoXJ/YJIlWKvCA6uC8r527nGN/z08
 dfFelj1nDs7/VrCSP4+109EjxLQnSYGgIWP0g0OsC+9wOmrQsYJ1azP1eNjm+NuC
 hPa8uYVEZxwVyJuEfu4ZB4NMZBlD2qnHoskvBKbyZ8yaVnbvlMp552XMwsmJBpCs
 8wArzabrJEz396LUUIYG829D7NBDuRav1Miu+FTzlbn+xZ/Y/S8OmhoG2stWa4wV
 y5x0M0DWgrqiZ9rMkz9A03UNnCInQVTfIBoMl63xFitW4/0vLsln3+CjzlKm7H46
 rD/tKACUoCDjR5DN+JwQzmTdL9zBb4p1cXwWjWb6rON3BkXmO0JVAxzurxI9PfX0
 ZWDydZ3HNmrm0d3J12zf3kTX56PfPFAGWUsEc4Ntb5zdWXSQJsE=
 =fZ3T
 -----END PGP SIGNATURE-----

Merge tag 'v5.4.73' into 5.4-2.3.x-imx

This is the 5.4.73 stable release

Conflicts:
- arch/arm/boot/dts/imx6sl.dtsi:
Commit [a1767c9019] in NXP tree is now covered with commit [5c4c2f437c]
from upstream.

- drivers/gpu/drm/mxsfb/mxsfb_drv.c:
Resolve merge hunk for patch [ed8b90d303] from upstream

- drivers/media/i2c/ov5640.c:
Patch [aa4bb8b883] in NXP tree is now covered by patches [79ec0578c7]
and [b2f8546056] from upstream. Changes from NXP patch [99aa4c8c18] are
covered in upstream version as well.

- drivers/net/ethernet/freescale/fec_main.c:
Fix merge fuzz for patch [9e70485b40] from upstream.

- drivers/usb/cdns3/gadget.c:
Keep NXP version of the file, upstream version is not compatible.

- drivers/usb/dwc3/core.c:
- drivers/usb/dwc3/core.h:
Fix merge fuzz of patch [08045050c6] together wth NXP patch [b30e41dc1e]

- sound/soc/fsl/fsl_sai.c:
- sound/soc/fsl/fsl_sai.h:
Commit [2ea70e51eb72a] in NXP tree is now covered with commit [1ad7f52fe6]
from upstream.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
 		2021-01-11 10:09:27 +00:00
..
bus MLK-24935-2 misc: vop: use dma_alloc_coherent to allocate vrings and device page directly 2020-10-29 16:41:13 +08:00
card mic: avoid statically declaring a 'struct device'. 2019-07-25 14:35:22 +02:00
common MLK-24934 mic: imx-host: fix kernel panic when cat /sys/class/mic/mic0/family&stepping 2020-10-29 13:03:16 +08:00
cosm MLK-24937-2 misc: mic: add the correct dependencies and fix build errors for COSM/SCIF modules 2020-10-30 09:38:48 +08:00
cosm_client treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 290 2019-06-05 17:36:38 +02:00
host MLK-24935-2 misc: vop: use dma_alloc_coherent to allocate vrings and device page directly 2020-10-29 16:41:13 +08:00
imx-card MLK-24866-2: mic: imx-card: fix the coverity issue of using uninitialized value 2020-10-14 10:32:56 +08:00
imx-host MLK-24935-2 misc: vop: use dma_alloc_coherent to allocate vrings and device page directly 2020-10-29 16:41:13 +08:00
scif This is the 5.4.73 stable release 2021-01-11 10:09:27 +00:00
vop misc: vop: add round_up(x,4) for vring_size to avoid kernel panic 2020-10-29 09:58:04 +01:00
Kconfig MLK-24937-2 misc: mic: add the correct dependencies and fix build errors for COSM/SCIF modules 2020-10-30 09:38:48 +08:00
Makefile MLK-24570: misc: mic: imx-host: add i.MX MIC host driver 2020-09-22 14:48:49 +08:00