Changes in Makefile

762f99f4f3cb41a775b5157dd761217beba65873 - Merge branch 'next' into for-linus

Sat, 15 Jan 2022 21:09:44 +0100

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

5d8dfaa71d87f742c53309b95cb6a8b274119027 - Merge tag 'v5.15' into next

Thu, 09 Dec 2021 08:43:50 +0100

Merge tag 'v5.15' into nextSync up with the mainline to get the latest APIs and DT bindings. List of files: /linux/drivers/media/mc/Makefile

46466ae3a105d9620e1355e33125a413b8c6ce18 - Merge branch 'perf/urgent' into perf/core, to pick up fixes

Thu, 26 Aug 2021 09:14:05 +0200

Merge branch 'perf/urgent' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/media/mc/Makefile

c87866ede44ad7da6b296d732221dc34ce1b154d - Merge tag 'v5.14-rc6' into locking/core, to pick up fixes

Tue, 17 Aug 2021 16:16:29 +0200

Merge tag 'v5.14-rc6' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/media/mc/Makefile

ca31fef11dc83e672415d5925a134749761329bd - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Tue, 27 Jul 2021 12:48:17 +0200

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextRequired bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/media/mc/Makefile

611ac726f9ebbb12f2113e5345ef109660954eeb - Merge drm/drm-next into drm-intel-gt-next

Tue, 13 Jul 2021 21:52:51 +0200

Merge drm/drm-next into drm-intel-gt-nextCatching up with 5.14-rc1 and also preparing for aneeded common topic branch for the "Minor revid/steppingand workaround cleanup"Reference: https://patchwork.freedesktop.org/series/92299/Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/media/mc/Makefile

d5bfbad214369f543958a1c6c55fa805e3f14976 - Merge drm/drm-next into drm-intel-next

Tue, 13 Jul 2021 21:51:31 +0200

Merge drm/drm-next into drm-intel-nextCatching up with 5.14-rc1Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/media/mc/Makefile

353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 - Merge branch 'fixes-v5.14' into fixes

Tue, 27 Jul 2021 10:25:08 +0200

Merge branch 'fixes-v5.14' into fixes List of files: /linux/drivers/media/mc/Makefile

c503c193db7d7ccc0c58b1ef694eaef331318149 - Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next

Thu, 01 Jul 2021 04:02:37 +0200

Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next List of files: /linux/drivers/media/mc/Makefile

857286e4c5ae5d2e860fd15d4628e707b434d7e5 - Merge remote-tracking branch 'torvalds/master' into perf/core

Wed, 30 Jun 2021 20:27:32 +0200

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/media/mc/Makefile

31e798fd6f0ff0acdc49c1a358b581730936a09a - Merge tag 'media/v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Tue, 29 Jun 2021 00:49:58 +0200

Merge tag 'media/v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaPull media updates from Mauro Carvalho Chehab: - V4L2 core control API was split into separate files - New RC maps: tango and tc-90405 - Hantro driver got support for G2/HEVC decoder - av7710 is moving to staging, together with some legacy APIs - several cleanups related to compat_ioctl32 code - Move the MPEG-2 stateless control type out of staging - Address several issues with RPM get logic on media drivers - Lots of cleanups, bug fixes and improvements.* tag 'media/v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (394 commits) media: s5p-mfc: Fix display delay control creation media: mtk-vpu: on suspend, read/write regs only if vpu is running media: video-mux: Skip dangling endpoints media: Fix Media Controller API config checks media: i2c: rdacm20: Re-work ov10635 reset media: i2c: rdacm20: Check return values media: i2c: rdacm20: Report camera module name media: i2c: rdacm20: Enable noise immunity media: i2c: rdacm20: Embed 'serializer' field media: i2c: rdacm21: Power up OV10640 before OV490 media: i2c: rdacm21: Fix OV10640 powerup media: i2c: rdacm21: Add delay after OV490 reset media: i2c: max9271: Introduce wake_up() function media: i2c: max9271: Check max9271_write() return media: i2c: max9286: Rework comments in .bound() media: i2c: max9286: Define high channel amplitude media: i2c: max9286: Cache channel amplitude media: i2c: max9286: Rename reverse_channel_mv media: i2c: max9286: Adjust parameters indent media: hantro: add support for Rockchip RK3036 ... List of files: /linux/drivers/media/mc/Makefile

50e7a31d30e8221632675abed3be306382324ca2 - media: Fix Media Controller API config checks

Wed, 16 Jun 2021 17:19:06 +0200

media: Fix Media Controller API config checksSmatch static checker warns that "mdev" can be null:sound/usb/media.c:287 snd_media_device_create() warn: 'mdev' can also be NULLIf CONFIG_MEDIA_CONTROLLER is disabled, this file should not be includedin the build.The below conditions in the sound/usb/Makefile are in place to ensure thatmedia.c isn't included in the build.sound/usb/Makefile:snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.oselect SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)The following config check in include/media/media-dev-allocator.h isin place to enable the API only when CONFIG_MEDIA_CONTROLLER andCONFIG_USB are enabled. #if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB)This check doesn't work as intended when CONFIG_USB=m. When CONFIG_USB=m,CONFIG_USB_MODULE is defined and CONFIG_USB is not. The above config checkdoesn't catch that CONFIG_USB is defined as a module and disables the API.This results in sound/usb enabling Media Controller specific ALSA drivercode, while Media disables the Media Controller API.Fix the problem requires two changes:1. Change the check to use IS_ENABLED to detect when CONFIG_USB is enabled as a module or static. Since CONFIG_MEDIA_CONTROLLER is a bool, leave the check unchanged to be consistent with drivers/media/Makefile.2. Change the drivers/media/mc/Makefile to include mc-dev-allocator.o in mc-objs when CONFIG_USB is enabled.Link: https://lore.kernel.org/alsa-devel/YLeAvT+R22FQ%2FEyw@mwanda/Reported-by: Dan Carpenter Signed-off-by: Shuah Khan Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab List of files: /linux/drivers/media/mc/Makefile

0898782247ae533d1f4e47a06bc5d4870931b284 - Merge branch 'next' into for-linus

Mon, 16 Sep 2019 18:56:27 +0200

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

d3f9990f1b48514b33342612b51fad238592d774 - Merge branch 'for-next' into for-linus

Sat, 14 Sep 2019 17:24:57 +0200

Merge branch 'for-next' into for-linusSigned-off-by: Takashi Iwai List of files: /linux/drivers/media/mc/Makefile

75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 23 Aug 2019 06:08:04 +0200

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in fixes for the XIVE interrupt controller which touch bothgeneric powerpc and PPC KVM code. To avoid merge conflicts, thesecommits will go upstream via the powerpc tree as well as the KVM tree.Signed-off-by: Paul Mackerras List of files: /linux/drivers/media/mc/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/media/mc/Makefile

cbd32a1c56e36fedaa93a727699188bd3e6e6f67 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Mon, 12 Aug 2019 14:36:27 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentPull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM. List of files: /linux/drivers/media/mc/Makefile

4aa31b4b61e4985e719352c329c3948d1932cb64 - Merge tag 'v5.3-rc4' into next

Mon, 12 Aug 2019 08:24:46 +0200

Merge tag 'v5.3-rc4' into nextSync up with mainline to bring in device_property_count_u32 andothernewer APIs. List of files: /linux/drivers/media/mc/Makefile

3f61fd41f38328f0a585eaba2d72d339fe9aecda - Merge tag 'v5.3-rc3' into drm-next-5.4

Fri, 09 Aug 2019 20:07:28 +0200

Merge tag 'v5.3-rc3' into drm-next-5.4Linux 5.3-rc3Signed-off-by: Alex Deucher List of files: /linux/drivers/media/mc/Makefile

ed32f8d42cee118b075e4372a55c7739a11094b2 - Merge drm/drm-next into drm-intel-next-queued

Mon, 29 Jul 2019 17:51:48 +0200

Merge drm/drm-next into drm-intel-next-queuedCatching up with 5.3-rc*Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/media/mc/Makefile