Changes in Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 21:03:44 +0000

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/drivers/staging/media/imx/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 04:37:18 +0000

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/drivers/staging/media/imx/Makefile

a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0 - Merge drm/drm-next into drm-intel-gt-next

Tue, 24 Oct 2023 08:50:22 +0000

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/staging/media/imx/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 19:40:46 +0000

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/drivers/staging/media/imx/Makefile

57390019b68b83f96eb98f490367b9df1f2d77cb - Merge drm/drm-next into drm-misc-next

Wed, 11 Oct 2023 07:50:59 +0000

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of Linux v6.6-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/staging/media/imx/Makefile

de80193308f43d3ae52cd3561e8ba77cd1437311 - Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Tue, 03 Oct 2023 07:32:25 +0000

Merge tag 'v6.6-rc4' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/media/imx/Makefile

6f23fc47c1b2ac226704fb7294f43ed3b0965e51 - Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Mon, 18 Sep 2023 20:17:15 +0000

Merge tag 'v6.6-rc2' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/media/imx/Makefile

a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 - Merge drm/drm-next into drm-intel-next

Fri, 15 Sep 2023 08:23:38 +0000

Merge drm/drm-next into drm-intel-nextSync to v6.6-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/staging/media/imx/Makefile

c900529f3d9161bfde5cca0754f83b4d3c3e0220 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 12 Sep 2023 06:53:30 +0000

Merge drm/drm-fixes into drm-misc-fixesForwarding to v6.6-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/staging/media/imx/Makefile

307d59039fb26212a84a9aa6a134a7d2bdea34ca - Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Fri, 01 Sep 2023 19:21:32 +0000

Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaPull media updates from Mauro Carvalho Chehab: - new i2c drivers: ds90ub913, ds90ub953, ds90ub960, dw9719, ds90ub913 - new Intel IVSC MEI drivers - some Mediatek platform drivers were moved to a common location - Intel atomisp2 driver is now working with the main ov2680 driver. Due to that, the atomisp2 ov2680 staging one was removed - the bttv driver was finally converted to videobuf2 framework. This was the last one upstream using videobuf version 1 core. We'll likely remove the old videobuf framework on 6.7 - lots of improvements at atomisp driver: it now works with normal I2C sensors. Several compile-mode dependecies to select between ISP2400 and ISP2401 are now solved in runtime - a new ipu-bridge logic was added to work with IVSC MEI drivers - venus driver gained better support for new VPU versions - the v4l core async framework has gained lots of improvements and cleanups - lots of other cleanups, improvements and driver fixes* tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (358 commits) media: ivsc: Add ACPI dependency media: bttv: convert to vb2 media: bttv: use audio defaults for winfast2000 media: bttv: refactor bttv_set_dma() media: bttv: move vbi_skip/vbi_count out of buffer media: bttv: remove crop info from bttv_buffer media: bttv: remove tvnorm field from bttv_buffer media: bttv: remove format field from bttv_buffer media: bttv: move do_crop flag out of bttv_fh media: bttv: copy vbi_fmt from bttv_fh media: bttv: copy vid fmt/width/height from fh media: bttv: radio use v4l2_fh instead of bttv_fh media: bttv: replace BUG with WARN_ON media: bttv: use video_drvdata to get bttv media: i2c: rdacm21: Fix uninitialized value media: coda: Remove duplicated include media: vivid: fix the racy dev->radio_tx_rds_owner media: i2c: ccs: Check rules is non-NULL media: i2c: ds90ub960: Fix PLL config for 1200 MHz CSI rate media: i2c: ds90ub953: Fix use of uninitialized variables ... List of files: /linux/drivers/staging/media/imx/Makefile

483fe862488f9116a80839f46b06842330b679d9 - staging: media: imx: Merge VIDEO_IMX_CSI into VIDEO_IMX_MEDIA

Mon, 24 Apr 2023 09:48:32 +0000

staging: media: imx: Merge VIDEO_IMX_CSI into VIDEO_IMX_MEDIAThe VIDEO_IMX_MEDIA Kconfig symbol used to select helpers shared betweenindependent drivers for different i.MX SoCs, and VIDEO_IMX_MEDIA thenselects drivers specific to the i.MX5 and i.MX6. Now that i.MX7 andi.MX8 support has moved to drivers/media/ and doesn't depend onVIDEO_IMX_CSI, there's no need to have separate Kconfig options. MergeVIDEO_IMX_CSI into VIDEO_IMX_MEDIA.Signed-off-by: Laurent Pinchart Signed-off-by: Hans Verkuil List of files: /linux/drivers/staging/media/imx/Makefile

cd063027c3049bbdd8bbfa65ca46b51a373686f3 - media: imx: Unstage the imx8mq-mipi-csi2 driver

Tue, 25 Apr 2023 09:08:04 +0000

media: imx: Unstage the imx8mq-mipi-csi2 driverThe imx8mq-mipi-csi2 MIPI CSI-2 receiver driver is used and maintained.There is no reason to keep it in staging. The accompanying CSI bridgedriver that uses it is in drivers/media/platform/nxp as well.One TODO is to get rid of csi_state's "state" and "lock" variables.Especially make sure suspend/resume is working without them. That canvery well be worked on from the new location.Also add a MAINTAINERS section for the imx8mq-mipi-csi2 mipi receiverdriver.Signed-off-by: Martin Kepplinger Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil List of files: /linux/drivers/staging/media/imx/Makefile

7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 - Merge branch 'next' into for-linus

Tue, 21 Feb 2023 19:19:49 +0000

Merge branch 'next' into for-linusPrepare input updates for 6.3 merge window. List of files: /linux/drivers/staging/media/imx/Makefile

6f84981772535e670e4e2df051a672af229b6694 - Merge drm/drm-next into drm-misc-next

Thu, 19 Jan 2023 09:56:12 +0000

Merge drm/drm-next into drm-misc-nextBackmerging into drm-misc-next to get DRM accelerator infrastructure,which is required by ipuv driver.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/staging/media/imx/Makefile

d0e99511834b6828c960e978d9a8cb6e5731250d - Merge wireless into wireless-next

Tue, 17 Jan 2023 11:36:25 +0000

Merge wireless into wireless-nextDue to the two cherry picked commits from wireless to wireless-next we haveseveral conflicts in mt76. To avoid any bugs with conflicts merge wireless intowireless-next.96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failuresfe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails List of files: /linux/drivers/staging/media/imx/Makefile

407da561244b9d51e6a794d6305ba38ec2c9d907 - Merge tag 'v6.2-rc3' into next

Tue, 10 Jan 2023 04:28:19 +0000

Merge tag 'v6.2-rc3' into nextMerge with mainline to bring in timer_shutdown_sync() API. List of files: /linux/drivers/staging/media/imx/Makefile

2c55d703391acf7e9101da596d0c15ee03b318a3 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 03 Jan 2023 07:32:12 +0000

Merge drm/drm-fixes into drm-misc-fixesLet's start the fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/staging/media/imx/Makefile

0d8eae7b124e2ddaee00f186fe922450faad0ed7 - Merge drm/drm-next into drm-intel-next

Mon, 02 Jan 2023 09:31:03 +0000

Merge drm/drm-next into drm-intel-nextSync up with v6.2-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/staging/media/imx/Makefile

b501d4dc83aa3940189b68045cadc8b3eac73988 - Merge drm/drm-next into drm-intel-gt-next

Fri, 30 Dec 2022 09:09:09 +0000

Merge drm/drm-next into drm-intel-gt-nextSync after v6.2-rc1 landed in drm-next.We need to get some dependencies in place before we can mergethe fixes series from Gwan-gyeong and Chris.References: https://lore.kernel.org/all/Y6x5JCDnh2rvh4lA@intel.com/Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/staging/media/imx/Makefile

1a931707ad4a46e79d4ecfee56d8f6e8cc8d4f28 - Merge remote-tracking branch 'torvalds/master' into perf/core

Fri, 16 Dec 2022 12:53:53 +0000

Merge remote-tracking branch 'torvalds/master' into perf/coreTo resolve a trivial merge conflict with c302378bc157f6a7 ("libbpf:Hashmap interface update to allow both long and void* keys/values"),where a function present upstream was removed in the perf toolsdevelopment tree.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/staging/media/imx/Makefile