Changes in Kconfig

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

Tue, 21 Feb 2023 20:19:49 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.3 merge window. List of files: /linux/drivers/media/pci/mantis/Kconfig

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

Thu, 19 Jan 2023 10:56:12 +0100

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/media/pci/mantis/Kconfig

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

Tue, 10 Jan 2023 05:28:19 +0100

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

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

Mon, 02 Jan 2023 10:31:03 +0100

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

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

Fri, 30 Dec 2022 10:09:09 +0100

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/media/pci/mantis/Kconfig

d0e99511834b6828c960e978d9a8cb6e5731250d - Merge wireless into wireless-next

Tue, 17 Jan 2023 12:36:25 +0100

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/media/pci/mantis/Kconfig

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

Tue, 03 Jan 2023 08:32:12 +0100

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

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

Fri, 16 Dec 2022 13:53:53 +0100

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/media/pci/mantis/Kconfig

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

Tue, 13 Dec 2022 20:36:58 +0100

Merge tag 'media/v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaPull media updates from Mauro Carvalho Chehab: - DVB core changes to avoid refcount troubles and UAF - DVB API/core has gained support for DVB-C2 and DVB-S2X - New sensor drivers: ov08x40, ov4689.c, st-vgxy61 and tc358746.c - Removal of an unused sensor driver: s5k4ecgx - Move microchip_csi2dc to a new directory, named after the manufacturer - Add media controller support to Microship drivers - Old Atmel/Microship drivers that don't use media controler got moved to staging - New drivers added for Renesas RZ/G2L CRU and MIPI CSI-2 support - Allwinner A31 camera sensor driver code was now split into a bridge and a separate processor driver - Added a virtual stateless decoder driver in order to test core support for stateless drivers and test userspace apps using it - removed platform-based support for ov9650, as this is not used anymore - atomisp now uses videobuf2 and supports normal mmap mode - the imx7-media-csi driver got promoted from staging - rcar-vin driver has gained support for gen3 UDS (Up Down Scaler) - most i2c drivers now use I2C .probe_new() kAPI - lots of drivers fixes, cleanups and improvements* tag 'media/v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits) media: s5c73m3: Switch to GPIO descriptors media: i2c: s5k5baf: switch to using gpiod API media: i2c: s5k6a3: switch to using gpiod API media: imx: remove code for non-existing config IMX_GPT_ICAP media: si470x: Fix use-after-free in si470x_int_in_callback() media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies media: coda: Add check for kmalloc media: coda: Add check for dcoda_iram_alloc dt-bindings: media: s5c73m3: Fix reset-gpio descriptor media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property media: s5k4ecgx: Delete driver media: s5k4ecgx: Switch to GPIO descriptors media: Switch to use dev_err_probe() helper headers: Remove some left-over license text in include/uapi/linux/v4l2-* headers: Remove some left-over license text in include/uapi/linux/dvb/ media: usb: pwc-uncompress: Use flex array destination for memcpy() media: s5p-mfc: Fix to handle reference queue during finishing media: s5p-mfc: Clear workbit to handle error condition media: s5p-mfc: Fix in register read and write for H264 media: imx: Use get_mbus_config instead of parsing upstream DT endpoints ... List of files: /linux/drivers/media/pci/mantis/Kconfig

37e6d30e89d699449082b22845f515fe47648087 - media: mantis: Kconfig: add depends on DVB_CORE for MANTIS_CORE

Mon, 16 May 2022 19:15:14 +0200

media: mantis: Kconfig: add depends on DVB_CORE for MANTIS_COREMANTIS_CORE needs DVB_CORE, set 'depends on' explicitlyERROR: modpost: "dvb_dmx_init" [drivers/media/pci/mantis/mantis_core.ko] undefined!ERROR: modpost: "dvb_unregister_adapter" [drivers/media/pci/mantis/mantis_core.ko] undefined!ERROR: modpost: "dvb_register_frontend" [drivers/media/pci/mantis/mantis_core.ko] undefined!ERROR: modpost: "dvb_ca_en50221_camchange_irq" [drivers/media/pci/mantis/mantis_core.ko] undefined!ERROR: modpost: "dvb_unregister_frontend" [drivers/media/pci/mantis/mantis_core.ko] undefined!>> ERROR: modpost: "dvb_ca_en50221_camready_irq" [drivers/media/pci/mantis/mantis_core.ko] undefined!>> ERROR: modpost: "dvb_frontend_detach" [drivers/media/pci/mantis/mantis_core.ko] undefined!>> ERROR: modpost: "dvb_dmxdev_release" [drivers/media/pci/mantis/mantis_core.ko] undefined!>> ERROR: modpost: "dvb_dmx_swfilter" [drivers/media/pci/mantis/mantis_core.ko] undefined!Link: https://lore.kernel.org/linux-media/20220516171515.16404-2-lecopzer.chen@mediatek.comReported-by: kernel test robot Signed-off-by: Lecopzer Chen Signed-off-by: Mauro Carvalho Chehab List of files: /linux/drivers/media/pci/mantis/Kconfig

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/pci/mantis/Kconfig

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 - Merge branch 'next' into for-linus

Sat, 20 Jul 2019 06:07:56 +0200

Merge branch 'next' into for-linusPrepare second round of input updates for 5.3 merge window. List of files: /linux/drivers/media/pci/mantis/Kconfig

ecb41832bd2a7a3f8ac93527cec5e51e3827daed - Merge tag 'v5.2' into next

Mon, 15 Jul 2019 18:42:32 +0200

Merge tag 'v5.2' into nextSync up with mainline to resolve conflicts in iforce driver. List of files: /linux/drivers/media/pci/mantis/Kconfig

74acee309fb2a434dce215d44014e6f8e06975ae - Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Wed, 10 Jul 2019 01:39:57 +0200

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus List of files: /linux/drivers/media/pci/mantis/Kconfig

3c53c6255d598db7084c5c3d7553d7200e857818 - Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Mon, 08 Jul 2019 14:45:20 +0200

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.3This is a very big update, mainly thanks to Morimoto-san's refactoringwork and some fairly large new drivers. - Lots more work on moving towards a component based framework from Morimoto-san. - Support for force disconnecting muxes from Jerome Brunet. - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant CX2072X, Realtek RT1011 and RT1308.Signed-off-by: Takashi Iwai List of files: /linux/drivers/media/pci/mantis/Kconfig

1d2af80d581d1bae81594e497cd57e345235b940 - Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

Sat, 06 Jul 2019 22:51:56 +0200

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/nextNAND core changes:- use longest matching pattern in ->exec_op() default parser- export NAND operation tracer- add flag to indicate panic_write in MTD- use kzalloc() instead of kmalloc() and memset()Raw NAND controller drivers changes:- brcmnand: * fix BCH ECC layout for large page NAND parts * fallback to detected ecc-strength, ecc-step-size * when oops in progress use pio and interrupt polling * code refactor code to introduce helper functions * add support for v7.3 controller- FSMC: * use nand_op_trace for operation tracing- GPMI: * move all driver code into single file * various cleanups (including dmaengine changes) * use runtime PM to manage clocks * implement exec_op- MTK: * correct low level time calculation of r/w cycle * improve data sampling timing for read cycle * add validity check for CE# pin setting * fix wrongly assigned OOB buffer pointer issue * re-license MTK NAND driver as Dual MIT/GPL- STM32: * manage the get_irq error case * increase DMA completion timeoutsRaw NAND chips drivers changes:- Macronix: add read-retry supportOnenand driver changes:- add support for 8Gb datasize chips- avoid fall-through warningsSPI-NAND changes:- define macros for page-read ops with three-byte addresses- add support for two-byte device IDs and then for GigaDevice GD5F1GQ4UFxxG- add initial support for Paragon PN26G0xA- handle the case where the last page read has bitflips List of files: /linux/drivers/media/pci/mantis/Kconfig

371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 - Merge tag 'v5.2-rc6' into rdma.git for-next

Sat, 29 Jun 2019 02:18:23 +0200

Merge tag 'v5.2-rc6' into rdma.git for-nextFor dependencies in next patches.Resolve conflicts:- Use uverbs_get_cleared_udata() with new cq allocation flow- Continue to delete nes despite SPDX conflict- Resolve list appends in mlx5_command_str()- Use u16 for vport_rule stuff- Resolve list appends in struct ib_clientSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/media/pci/mantis/Kconfig

53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 - Merge tag 'v5.2-rc6' into asoc-5.3

Wed, 26 Jun 2019 13:39:34 +0200

Merge tag 'v5.2-rc6' into asoc-5.3Linux 5.2-rc6 List of files: /linux/drivers/media/pci/mantis/Kconfig

355a47ae7ebcf9d605aa809b259d380422e81b8d - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Wed, 26 Jun 2019 12:22:54 +0200

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixesSome fixes have been accidentally pushed to this, so I cannot fost-forward.Required to pull in the remove-fbcon-notifiers fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/media/pci/mantis/Kconfig

2ee692802b8f6c54bd6499addd3d07c2833d84d8 - Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next

Wed, 19 Jun 2019 15:18:48 +0200

Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-nexttopic/remove-fbcon-notifiers:- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking- assorted locking checks in vt/console code- assorted notifier and cleanups in fbdev and backlight codeOne trivial merge conflict fixed.Signed-off-by: Bartlomiej Zolnierkiewicz List of files: /linux/drivers/media/pci/mantis/Kconfig