mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-26 05:11:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
83ded7cfaccccd2f4041769c313b58b4c9e265ad
linux/drivers
History
Zhang Lixu 83ded7cfac iio: hid-sensor-prox: Restore lost scale assignments 
The variables `scale_pre_decml`, `scale_post_decml`, and `scale_precision`
were assigned in commit d68c592e02 ("iio: hid-sensor-prox: Fix scale not
correct issue"), but due to a merge conflict in
commit 9c15db92a8 ("Merge tag 'iio-for-5.13a' of
https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next"),
these assignments were lost.

Add back lost assignments and replace `st->prox_attr` with
`st->prox_attr[0]` because commit 596ef5cf65 ("iio: hid-sensor-prox: Add
support for more channels") changed `prox_attr` to an array.

Cc: stable@vger.kernel.org # 5.13+
Fixes: 9c15db92a8 ("Merge tag 'iio-for-5.13a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next")
Signed-off-by: Zhang Lixu <lixu.zhang@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://patch.msgid.link/20250331055022.1149736-2-lixu.zhang@intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
2025-04-07 19:32:49 +01:00
..
accel
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
accessibility
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
acpi
Merge tag 'libnvdimm-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2025-04-02 20:27:18 -07:00
amba
…
android
…
ata
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
atm
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
auxdisplay
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
base
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
bcma
…
block
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
bluetooth
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
bus
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
cache
…
cdrom
…
cdx
Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'rockchip', 's390', 'core', 'intel/vt-d' and 'amd/amd-vi' into next
2025-03-20 09:11:09 +01:00
char
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
clk
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
2025-04-03 12:21:44 -07:00
clocksource
Merge tag 'riscv-for-linus-6.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
2025-04-04 09:49:17 -07:00
comedi
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
connector
…
counter
Merge tag 'char-misc-6.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2025-04-02 18:03:34 -07:00
cpufreq
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
cpuidle
Merge tag 'pmdomain-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
2025-03-25 20:40:51 -07:00
crypto
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
cxl
Merge tag 'cxl-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
2025-04-02 20:04:43 -07:00
dax
device/dax: properly refcount device dax pages when mapping
2025-03-17 22:06:41 -07:00
dca
…
devfreq
…
dio
…
dma
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
dma-buf
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
dpll
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2025-03-20 21:38:01 +01:00
edac
Merge tag 'edac_updates_for_v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
2025-03-25 14:00:26 -07:00
eisa
…
extcon
…
firewire
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
firmware
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
fpga
…
fsi
…
fwctl
pds_fwctl: add rpc and query support
2025-03-21 20:57:55 -03:00
gnss
…
gpio
Merge tag 'net-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2025-03-26 21:48:21 -07:00
gpu
Merge tag 'timers-cleanups-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2025-04-06 08:35:37 -07:00
greybus
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
hid
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
hsi
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
hte
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
hv
Merge tag 'mm-stable-2025-03-30-16-52' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2025-04-01 09:29:18 -07:00
hwmon
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
hwspinlock
hwspinlock: Remove unused hwspin_lock_get_id()
2025-03-21 17:12:04 -05:00
hwtracing
Merge tag 'char-misc-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2025-04-01 11:26:08 -07:00
i2c
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
i3c
i3c: Add NULL pointer check in i3c_master_queue_ibi()
2025-03-31 11:44:00 +02:00
idle
Merge tag 'pm-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2025-03-25 15:00:18 -07:00
iio
iio: hid-sensor-prox: Restore lost scale assignments
2025-04-07 19:32:49 +01:00
infiniband
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
input
Merge tag 'timers-cleanups-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2025-04-06 08:35:37 -07:00
interconnect
…
iommu
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
ipack
…
irqchip
irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
2025-04-04 16:39:10 +02:00
isdn
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
leds
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
macintosh
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
mailbox
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
mcb
…
md
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
media
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
memory
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
memstick
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2025-03-26 19:57:34 -07:00
mfd
Merge tag 'mfd-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2025-03-29 14:33:13 -07:00
misc
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
mmc
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
most
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
mtd
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
mux
…
net
treewide: Convert new and leftover hrtimer_init() users
2025-04-05 10:30:17 +02:00
nfc
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
ntb
Merge tag 'ntb-6.15' of https://github.com/jonmason/ntb
2025-04-04 14:23:07 -07:00
nubus
…
nvdimm
Merge tag 'libnvdimm-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2025-04-02 20:27:18 -07:00
nvme
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
nvmem
net, treewide: define and use MAC_ADDR_STR_LEN
2025-03-19 19:17:58 +01:00
of
Merge tag 'devicetree-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
2025-03-29 11:23:16 -07:00
opp
…
parisc
…
parport
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
pci
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
pcmcia
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
peci
…
perf
Merge tag 'pci-v6.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2025-03-28 19:36:53 -07:00
phy
Merge tag 'phy-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
2025-04-01 12:47:11 -07:00
pinctrl
Merge tag 'pinctrl-v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2025-03-29 16:59:16 -07:00
platform
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
pmdomain
pmdomain: arm: scmi_pm_domain: Remove redundant state verification
2025-03-17 11:12:01 +01:00
pnp
Merge tag 'staging-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2025-04-02 18:09:17 -07:00
power
Merge tag 'i2c-for-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2025-04-01 14:21:02 -07:00
powercap
Merge tag 'pm-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2025-03-25 15:00:18 -07:00
pps
treewide: Convert new and leftover hrtimer_init() users
2025-04-05 10:30:17 +02:00
ps3
…
ptp
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
pwm
Merge tag 'pinctrl-v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2025-03-29 16:59:16 -07:00
rapidio
…
ras
…
regulator
Merge tag 'objtool-urgent-2025-04-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2025-04-02 10:30:10 -07:00
remoteproc
remoteproc: qcom_q6v5_pas: Make single-PD handling more robust
2025-03-22 08:42:39 -05:00
reset
Merge tag 'rproc-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
2025-03-29 17:18:50 -07:00
rpmsg
…
rtc
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
s390
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
sbus
…
scsi
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
sh
…
siox
…
slimbus
…
soc
Merge tag 'soc-drivers-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2025-04-04 09:06:32 -07:00
soundwire
Merge tag 'soundwire-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
2025-04-01 12:43:13 -07:00
spi
Merge tag 'spi-fix-v6.15-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2025-04-04 09:09:34 -07:00
spmi
…
ssb
…
staging
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
target
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
tc
…
tee
…
thermal
Merge tag 'thermal-6.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2025-04-01 16:51:44 -07:00
thunderbolt
Merge tag 'usb-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2025-04-02 18:23:31 -07:00
tty
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
ufs
Revert "Merge tag 'irq-msi-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"
2025-03-28 11:22:54 -07:00
uio
…
usb
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
vdpa
…
vfio
Merge tag 'vfio-v6.15-rc1' of https://github.com/awilliam/linux-vfio
2025-04-01 19:35:19 -07:00
vhost
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2025-04-01 18:52:54 -07:00
video
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
virt
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
virtio
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2025-04-01 18:52:54 -07:00
w1
…
watchdog
treewide: Switch/rename to timer_delete[_sync]()
2025-04-05 10:30:12 +02:00
xen
Merge tag 'mm-stable-2025-03-30-16-52' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2025-04-01 09:29:18 -07:00
zorro
…
Kconfig
…
Makefile
…