Changes in Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/drivers/media/pci/zoran/Makefile

e291c116f60f3c1ca98090f0f8e7c77e658562fb - Merge branch 'next' into for-linus

Mon, 12 Dec 2022 19:47:03 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.2 merge window. List of files: /linux/drivers/media/pci/zoran/Makefile

29583dfcd2dd72c766422bd05c16f06c6b1fb356 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 21 Nov 2022 09:03:13 +0100

Merge drm/drm-next into drm-misc-next-fixesBackmerging to update drm-misc-next-fixes for the final phaseof the release cycle.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/media/pci/zoran/Makefile

002c6ca75289a4ac4f6738213dd2d258704886e4 - Merge drm/drm-next into drm-intel-next

Mon, 14 Nov 2022 20:32:34 +0100

Merge drm/drm-next into drm-intel-nextCatch up on 6.1-rc cycle in order to solve the intel_backlightconflict on linux-next.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/media/pci/zoran/Makefile

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

Fri, 04 Nov 2022 10:11:30 +0100

Merge drm/drm-next into drm-intel-gt-nextNeeded to bring in v6.1-rc1 which contains commit f683b9d61319 ("i915: use the VMA iterator")which is needed for series https://patchwork.freedesktop.org/series/110083/ .Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/media/pci/zoran/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/drivers/media/pci/zoran/Makefile

1aca5ce036e3499336d1a2ace3070f908381c055 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 20 Oct 2022 09:09:00 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get v6.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/media/pci/zoran/Makefile

008f05a72d32dcc14038801649ec67af765fcc3c - ASoC: jz4752b: Capture fixes

Wed, 19 Oct 2022 17:37:01 +0200

ASoC: jz4752b: Capture fixesMerge series from Siarhei Volkau :The patchset fixes: - Line In path stays powered off during capturing or bypass to mixer. - incorrectly represented dB values in alsamixer, et al. - incorrect represented Capture input selector in alsamixer in Playback tab. - wrong control selected as Capture Master List of files: /linux/drivers/media/pci/zoran/Makefile

a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb - Merge drm/drm-next into drm-misc-next

Tue, 18 Oct 2022 15:00:03 +0200

Merge drm/drm-next into drm-misc-nextLet's kick-off this release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/media/pci/zoran/Makefile

c29a017f9df34d190fbc7917d30dbefce7d9dc1f - Merge tag 'v6.1-rc1' into next

Mon, 17 Oct 2022 11:36:32 +0200

Merge tag 'v6.1-rc1' into nextMerge with mainline to bring in the latest changes to twl4030 driver. List of files: /linux/drivers/media/pci/zoran/Makefile

8048b8358031ae742c1c8f16f196f6d8070bb09f - Merge branch 'master' into mm-hotfixes-stable

Mon, 17 Oct 2022 01:09:11 +0200

Merge branch 'master' into mm-hotfixes-stable List of files: /linux/drivers/media/pci/zoran/Makefile

5d435a3f7b6cb1db566d0f56f5f8dc33be0dde69 - Merge tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Fri, 07 Oct 2022 20:04:35 +0200

Merge tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaPull media updates from Mauro Carvalho Chehab: - New driver for Mediatek MDP V3 - New driver for NXP i.MX DW100 dewarper - Zoran driver got promoted from staging - Hantro and related drivers got promoted from staging - Several VB1 drivers got moved to staging/deprecated (cpia2, fsl-viu, meye, saa7146, av7110, stkwebcam, tm6000, vpfe_capture, davinci, zr364xx) - Usual set of driver fixes, improvements and cleanups* tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (107 commits) media: destage Hantro VPU driver media: platform: mtk-mdp3: add MediaTek MDP3 driver media: dt-binding: mediatek: add bindings for MediaTek CCORR and WDMA media: dt-binding: mediatek: add bindings for MediaTek MDP3 components media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init media: xilinx: video: Add 1X12 greyscale format media: xilinx: csi2rxss: Add 1X12 greyscale format media: staging: media: imx: imx7-media-csi: Increase video mem limit media: uvcvideo: Limit power line control for Sonix Technology media: uvcvideo: Use entity get_cur in uvc_ctrl_set media: uvcvideo: Fix typo 'the the' in comment media: uvcvideo: Use indexed loops in uvc_ctrl_init_ctrl() media: uvcvideo: Fix memory leak in uvc_gpio_parse media: renesas: vsp1: Add support for RZ/G2L VSPD media: renesas: vsp1: Add VSP1_HAS_NON_ZERO_LBA feature bit media: renesas: vsp1: Add support for VSP software version media: renesas: vsp1: Add support to deassert/assert reset line media: dt-bindings: media: renesas,vsp1: Document RZ/G2L VSPD bindings media: meson: vdec: add missing clk_disable_unprepare on error in vdec_hevc_start() media: amphion: fix a bug that vpu core may not resume after suspend ... List of files: /linux/drivers/media/pci/zoran/Makefile

2a0c28063de23646bb56152095ce73ea2284dc26 - media: zoran: move to mainline

Wed, 10 Aug 2022 13:54:45 +0200

media: zoran: move to mainlineThe zoran driver can be moved back to mainline after it has beenconverted by Corentin Labbe to vb2.Note that the zoran driver no longer supports video output, butvideo capture is working fine now.Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab List of files: /linux/drivers/media/pci/zoran/Makefile

498495dba268b20e8eadd7fe93c140c68b6cc9d2 - Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Mon, 08 Jan 2018 16:54:50 +0100

Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel List of files: /linux/drivers/media/pci/zoran/Makefile

70a02f840c5113cd9255ce4c1b1848bb48b0bd21 - Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Fri, 29 Dec 2017 17:49:13 +0100

Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.15-rc5 List of files: /linux/drivers/media/pci/zoran/Makefile

2ef6765ccaab2c69470d7049d9a9bf6456a6e666 - Merge tag 'drm-intel-next-2017-12-14' into gvt-next

Mon, 18 Dec 2017 09:29:37 +0100

Merge tag 'drm-intel-next-2017-12-14' into gvt-next- Fix documentation build issues (Randy, Markus)- Fix timestamp frequency calculation for perf on CNL (Lionel)- New DMC firmware for Skylake (Anusha)- GTT flush fixes and other GGTT write track and refactors (Chris)- Taint kernel when GPU reset fails (Chris)- Display workarounds organization (Lucas)- GuC and HuC initialization clean-up and fixes (Michal)- Other fixes around GuC submission (Michal)- Execlist clean-ups like caching ELSP reg offset and improving log readability (Chri\s)- Many other improvements on our logs and dumps (Chris)- Restore GT performance in headless mode with DMC loaded (Tvrtko)- Stop updating legacy fb parameters since FBC is not using anymore (Daniel)- More selftest improvements (Chris)- Preemption fixes and improvements (Chris)- x86/early-quirks improvements for Intel graphics stolen memory. (Joonas, Matthew)- Other improvements on Stolen Memory code to be resource centric. (Matthew)- Improvements and fixes on fence allocation/release (Chris).GVT:- fixes for two coverity scan errors (Colin)- mmio switch code refine (Changbin)- more virtual display dmabuf fixes (Tina/Gustavo)- misc cleanups (Pei)- VFIO mdev display dmabuf interface and gvt support (Tina)- VFIO mdev opregion support/fixes (Tina/Xiong/Chris)- workload scheduling optimization (Changbin)- preemption fix and temporal workaround (Zhenyu)- and misc fixes after refactor (Chris) List of files: /linux/drivers/media/pci/zoran/Makefile

d21bd6898336a7892914d308d5e0868f0b863571 - Sync to v4.15-rc3 for security subsystem developers to work against.

Mon, 11 Dec 2017 07:01:08 +0100

Sync to v4.15-rc3 for security subsystem developers to work against. List of files: /linux/drivers/media/pci/zoran/Makefile

6647852abc1fd74e9c5e0dcf404ea4cb9c929630 - Merge airlied/drm-next into drm-intel-next-queued

Fri, 08 Dec 2017 19:15:30 +0100

Merge airlied/drm-next into drm-intel-next-queuedChris requested this backmerge for a reconciliation ondrm_print.h between drm-misc-next and drm-intel-next-queuedSigned-off-by: Rodrigo Vivi List of files: /linux/drivers/media/pci/zoran/Makefile

7b47c66cfa203288c43851260edeeb0fae56f692 - Merge arlied/drm-next into drm-misc-next

Mon, 04 Dec 2017 19:04:45 +0100

Merge arlied/drm-next into drm-misc-nextWe need to pull 66660d4cf21b (drm: add connector info/property fornon-desktop displays [v2]) into drm-misc-next to continue the developmentof the display rotation series.Effectively this also pulls 4.15-r2 into drm-misc-next.Signed-off-by: Gustavo Padovan List of files: /linux/drivers/media/pci/zoran/Makefile

d218439feccafaa3e852bbaecc0d9f6110096b65 - Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd

Mon, 04 Dec 2017 18:59:52 +0100

Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd List of files: /linux/drivers/media/pci/zoran/Makefile