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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/Kconfig

6599e683db1bf22fee74302c47e31b9a42a1c3d2 - Merge tag 'v6.2-rc1' into media_tree

Wed, 28 Dec 2022 17:07:44 +0100

Merge tag 'v6.2-rc1' into media_treeLinux 6.2-rc1* tag 'v6.2-rc1': (14398 commits) Linux 6.2-rc1 treewide: Convert del_timer*() to timer_shutdown*() pstore: Properly assign mem_type property pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXES cfi: Fix CFI failure with KASAN perf python: Fix splitting CC into compiler and options afs: Stop implementing ->writepage() afs: remove afs_cache_netfs and afs_zap_permits() declarations afs: remove variable nr_servers afs: Fix lost servers_outstanding count ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless ALSA: azt3328: Remove the unused function snd_azf3328_codec_outl() gcov: add support for checksum field test_maple_tree: add test for mas_spanning_rebalance() on insufficient data maple_tree: fix mas_spanning_rebalance() on insufficient data hugetlb: really allocate vma lock for all sharable vmas kmsan: export kmsan_handle_urb kmsan: include linux/vmalloc.h mm/mempolicy: fix memory leak in set_mempolicy_home_node system call mm, mremap: fix mremap() expanding vma with addr inside vma ... List of files: /linux/drivers/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/Kconfig

4d03390b5cb97ea8562fcf324106c4735805d558 - Merge tag 'hwmon-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Tue, 13 Dec 2022 22:09:38 +0100

Merge tag 'hwmon-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-stagingPull hwmon updates from Guenter Roeck: "New drivers: - Driver for OneXPlayer mini AMD sensors - Ampere's Altra smpro-hwmon driver New chip and attribute support in existing drivers: - nct6775: Support for ASUS CROSSHAIR VIII/TUF/ProArt B550M - pmbus/ltc2978: Support for LTC7132 - aquacomputer_d5next: Support for temperature sensor offsets and flow sensor pulses - coretemp: Support for dynamic ttarget and tjmax Improvements: - Use devm_regulator_get_enable() where appropriate - Use sysfs_emit() instead of scnprintf() - Remove some useless #include - Include when appropriate - Use simple i2c probe - it87: Check for a valid chip before using force_id, and new new module parameter to ignore ACPI resource conflicts - jc42: Use regmap, and restore min/max/critical temperatures on resume - Add reporting power good and status to PMBus based regulators Last minute fixes: - emc2305: Fix probing of emc2301/2/3, and fix setting pwm values manually if THERMAL is enabled And various other minor fixes and improvements"* tag 'hwmon-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (37 commits) hwmon: (emc2305) fix pwm never being able to set lower hwmon: (emc2305) fix unable to probe emc2301/2/3 hwmon: (dell-smm) Move error message to make probing silent hwmon: use sysfs_emit() to instead of scnprintf() hwmon: (oxp-sensors) Fix pwm reading hwmon: (aquacomputer_d5next) Add support for Quadro flow sensor pulses hwmon: (pmbus/core) Implement regulator get_status hwmon: (oxp-sensors) Add AOK ZOE and Mini PRO hwmon: (gsc-hwmon) Switch to flexible array to simplify code hwmon: (pmbus) Add power good support hwmon: (nct6775) add ASUS CROSSHAIR VIII/TUF/ProArt B550M hwmon: (coretemp) Add support for dynamic ttarget hwmon: (coretemp) Add support for dynamic tjmax hwmon: (coretemp) rearrange tjmax handing code hwmon: Remove some useless #include hwmon: (coretemp) Remove obsolete temp_data->valid hwmon: add OneXPlayer mini AMD sensors driver hwmon: (aquacomputer_d5next) Clear up macros and comments hwmon: (it87) Add DMI table for future extensions hwmon: Include when appropriate ... List of files: /linux/drivers/hwmon/occ/Kconfig

6d270868cd529c39ac746e9ae3522c43f2764aca - hwmon: (occ) OCC sensors aren't arch-specific

Mon, 24 Oct 2022 10:15:27 +0200

hwmon: (occ) OCC sensors aren't arch-specificCommit c112d75840fb ("hwmon: OCC drivers are ARM-only") made the OCCsensor drivers not selectable on powerpc64: These drivers are for a BMC inside PowerPC servers. The BMC runs on ARM hardware, so only propose the drivers on this architecture, unless build-testing.... but we now have a powerpc64 BMC (still for a powerpc64 host), sodrop the `depends on` that excludes building for this platform.Signed-off-by: Jeremy Kerr Acked-by: Joel Stanley Link: https://lore.kernel.org/r/20221024081527.3842565-1-jk@codeconstruct.com.auSigned-off-by: Guenter Roeck List of files: /linux/drivers/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/Kconfig

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 08:24:10 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.3 merge window. List of files: /linux/drivers/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/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/hwmon/occ/Kconfig