1. 09 Nov, 2020 1 commit
  2. 05 Nov, 2020 2 commits
  3. 29 Oct, 2020 1 commit
    • Hans de Goede's avatar
      HID: i2c-hid: Put ACPI enumerated devices in D3 on shutdown · 5c7e02a8
      Hans de Goede authored
      The i2c-hid driver would quietly fail to probe the i2c-hid sensor-hub
      with an ACPI device-id of SMO91D0 every other boot.
      
      Specifically, the i2c_smbus_read_byte() "Make sure there is something at
      this address" check would fail every other boot.
      
      It seems that the BIOS does not properly reset/power-cycle the device
      leaving it in a confused state where it refuses to respond to i2c-xfers.
      On boots where probing the device failed, the driver-core puts the device
      in D3 after the probe-failure, which causes the probe to succeed the next
      boot.
      
      Putting the device in D3 from the shutdown-handler fixes the sensors not
      working every other boot.
      
      This has been tested on both a Lenovo Miix 2-10 and a Dell Venue 8 Pro 5830
      both of which use an i2c-hid sensor-hub with an ACPI id of SMO91D0.
      
      Note that it is safe to call acpi_device_set_power() with a NULL pointer
      as first argument, so on none ACPI enumerated devices this change is a
      no-op.
      
      Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Acked-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      5c7e02a8
  4. 23 Oct, 2020 2 commits
    • Jiri Kosina's avatar
      HID: add support for Sega Saturn · 1811977c
      Jiri Kosina authored
      This device needs HID_QUIRK_MULTI_INPUT in order to be presented to userspace
      in a consistent way.
      Reported-and-tested-by: default avatarDavid Gámiz Jiménez <david.gamiz@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      1811977c
    • Frank Yang's avatar
      HID: cypress: Support Varmilo Keyboards' media hotkeys · 652f3d00
      Frank Yang authored
      The Varmilo VA104M Keyboard (04b4:07b1, reported as Varmilo Z104M)
      exposes media control hotkeys as a USB HID consumer control device, but
      these keys do not work in the current (5.8-rc1) kernel due to the
      incorrect HID report descriptor. Fix the problem by modifying the
      internal HID report descriptor.
      
      More specifically, the keyboard report descriptor specifies the
      logical boundary as 572~10754 (0x023c ~ 0x2a02) while the usage
      boundary is specified as 0~10754 (0x00 ~ 0x2a02). This results in an
      incorrect interpretation of input reports, causing inputs to be ignored.
      By setting the Logical Minimum to zero, we align the logical boundary
      with the Usage ID boundary.
      
      Some notes:
      
      * There seem to be multiple variants of the VA104M keyboard. This
        patch specifically targets 04b4:07b1 variant.
      
      * The device works out-of-the-box on Windows platform with the generic
        consumer control device driver (hidserv.inf). This suggests that
        Windows either ignores the Logical Minimum/Logical Maximum or
        interprets the Usage ID assignment differently from the linux
        implementation; Maybe there are other devices out there that only
        works on Windows due to this problem?
      Signed-off-by: default avatarFrank Yang <puilp0502@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      652f3d00
  5. 22 Oct, 2020 3 commits
  6. 15 Oct, 2020 22 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · bf36c6b9
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - Lenovo X1 Tablet support improvements from Mikael Wikström
      
       - "heartbeat" report fix for several Wacom devices from Jason Gerecke
      
       - bounds checking fix in hid-roccat from Dan Carpenter
      
       - stylus battery reporting fix from Dmitry Torokhov
      
       - i2c-hid support for wakeup from suspend-to-idle from Kai-Heng Feng
      
       - new driver for Vivaldi devices from Sean O'Brien
      
       - other assorted small fixes and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
        HID: i2c-hid: Enable wakeup capability from Suspend-to-Idle
        HID: add vivaldi HID driver
        HID: hid-input: fix stylus battery reporting
        HID: wacom: Avoid entering wacom_wac_pen_report for pad / battery
        HID: i2c-hid: fix kerneldoc warnings in i2c-hid-core.c
        HID: core: fix kerneldoc warnings in hid-core.c
        HID: multitouch: Lenovo X1 Tablet Gen2 trackpoint and buttons
        HID: multitouch: Lenovo X1 Tablet Gen3 trackpoint and buttons
        HID: alps: clean up indentation issue
        HID: intel-ish-hid: simplify the return expression of ishtp_bus_remove_device()
        HID: hid-debug: fix nonblocking read semantics wrt EIO/ERESTARTSYS
        HID: i2c-hid: Prefer asynchronous probe
        HID: ite: Add USB id match for Acer One S1003 keyboard dock
        HID: roccat: add bounds checking in kone_sysfs_write_settings()
        HID: wiimote: narrow spinlock range in wiimote_hid_event()
        HID: wiimote: make handlers[] const
        HID: apple: Add support for Matias wireless keyboard
        HID: cp2112: Use irqchip template
      bf36c6b9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching · 0cd7d979
      Linus Torvalds authored
      Pull livepatching update from Jiri Kosina:
       "livepatching kselftest output fix from Miroslav Benes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
        selftests/livepatch: Do not check order when using "comm" for dmesg checking
      0cd7d979
    • Linus Torvalds's avatar
      Merge tag 'dio_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 4a165feb
      Linus Torvalds authored
      Pull direct-io fix from Jan Kara:
       "Fix for unaligned direct IO read past EOF in legacy DIO code"
      
      * tag 'dio_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        direct-io: defer alignment check until after the EOF check
        direct-io: don't force writeback for reads beyond EOF
        direct-io: clean up error paths of do_blockdev_direct_IO
      4a165feb
    • Linus Torvalds's avatar
      Merge tag 'fs_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · b77a69b8
      Linus Torvalds authored
      Pull UDF, reiserfs, ext2, quota fixes from Jan Kara:
      
       - a couple of UDF fixes for issues found by syzbot fuzzing
      
       - a couple of reiserfs fixes for issues found by syzbot fuzzing
      
       - some minor ext2 cleanups
      
       - quota patches to support grace times beyond year 2038 for XFS quota
         APIs
      
      * tag 'fs_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        reiserfs: Fix oops during mount
        udf: Limit sparing table size
        udf: Remove pointless union in udf_inode_info
        udf: Avoid accessing uninitialized data on failed inode read
        quota: clear padding in v2r1_mem2diskdqb()
        reiserfs: Initialize inode keys properly
        udf: Fix memory leak when mounting
        udf: Remove redundant initialization of variable ret
        reiserfs: only call unlock_new_inode() if I_NEW
        ext2: Fix some kernel-doc warnings in balloc.c
        quota: Expand comment describing d_itimer
        quota: widen timestamps for the fs_disk_quota structure
        reiserfs: Fix memory leak in reiserfs_parse_options()
        udf: Use kvzalloc() in udf_sb_alloc_bitmap()
        ext2: remove duplicate include
      b77a69b8
    • Linus Torvalds's avatar
      Merge tag 'configfs-5.10' of git://git.infradead.org/users/hch/configfs · ca5387e4
      Linus Torvalds authored
      Pull configfs updates from Christoph Hellwig:
       "Various cleanups for the configfs samples (Bartosz Golaszewski)"
      
      * tag 'configfs-5.10' of git://git.infradead.org/users/hch/configfs:
        samples: configfs: prefer pr_err() over bare printk(KERN_ERR
        samples: configfs: don't use spaces before tabs
        samples: configfs: consolidate local variables of the same type
        samples: configfs: don't reinitialize variables which are already zeroed
        samples: configfs: replace simple_strtoul() with kstrtoint()
        samples: configfs: fix alignment in item struct
        samples: configfs: drop unnecessary ternary operators
        samples: configfs: remove redundant newlines
        MAINTAINERS: add the sample directory to the configfs entry
      ca5387e4
    • Linus Torvalds's avatar
      Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping · 5a32c341
      Linus Torvalds authored
      Pull dma-mapping updates from Christoph Hellwig:
      
       - rework the non-coherent DMA allocator
      
       - move private definitions out of <linux/dma-mapping.h>
      
       - lower CMA_ALIGNMENT (Paul Cercueil)
      
       - remove the omap1 dma address translation in favor of the common code
      
       - make dma-direct aware of multiple dma offset ranges (Jim Quinlan)
      
       - support per-node DMA CMA areas (Barry Song)
      
       - increase the default seg boundary limit (Nicolin Chen)
      
       - misc fixes (Robin Murphy, Thomas Tai, Xu Wang)
      
       - various cleanups
      
      * tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping: (63 commits)
        ARM/ixp4xx: add a missing include of dma-map-ops.h
        dma-direct: simplify the DMA_ATTR_NO_KERNEL_MAPPING handling
        dma-direct: factor out a dma_direct_alloc_from_pool helper
        dma-direct check for highmem pages in dma_direct_alloc_pages
        dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>
        dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma
        dma-mapping: move dma-debug.h to kernel/dma/
        dma-mapping: remove <asm/dma-contiguous.h>
        dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
        dma-contiguous: remove dma_contiguous_set_default
        dma-contiguous: remove dev_set_cma_area
        dma-contiguous: remove dma_declare_contiguous
        dma-mapping: split <linux/dma-mapping.h>
        cma: decrease CMA_ALIGNMENT lower limit to 2
        firewire-ohci: use dma_alloc_pages
        dma-iommu: implement ->alloc_noncoherent
        dma-mapping: add new {alloc,free}_noncoherent dma_map_ops methods
        dma-mapping: add a new dma_alloc_pages API
        dma-mapping: remove dma_cache_sync
        53c700: convert to dma_alloc_noncoherent
        ...
      5a32c341
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine · f065199d
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "Core:
      
         - Mark dma_request_slave_channel() deprecated in favour of
           dma_request_chan()
      
         - subsystem conversion for tasklet_setup() API
      
         - subsystem removal of local dma_parms for arm drivers
      
        Also updates to bunch of driver notably TI, DW and AXI-DMAC"
      
      * tag 'dmaengine-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (104 commits)
        dmaengine: owl-dma: fix kernel-doc style for enum
        dmaengine: zynqmp_dma: fix kernel-doc style for tasklet
        dmaengine: xilinx_dma: fix kernel-doc style for tasklet
        dmaengine: qcom: bam_dma: fix kernel-doc style for tasklet
        dmaengine: altera-msgdma: fix kernel-doc style for tasklet
        dmaengine: xilinx: dpdma: convert tasklets to use new tasklet_setup() API
        dmaengine: sf-pdma: convert tasklets to use new tasklet_setup() API
        dt-bindings: Fix 'reg' size issues in zynqmp examples
        dmaengine: rcar-dmac: drop double zeroing
        dmaengine: sh: drop double zeroing
        dmaengine: ioat: Allocate correct size for descriptor chunk
        dmaengine: ti: k3-udma: use devm_platform_ioremap_resource_byname
        dmaengine: fsl: remove bad channel update
        dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status
        dmaengine: pl330: fix argument for tasklet
        dmaengine: dmatest: Return boolean result directly in filter()
        dmaengine: dmatest: Check list for emptiness before access its last entry
        dmaengine: ti: k3-udma-glue: fix channel enable functions
        dmaengine: iop-adma: Fix pointer cast warnings
        dmaengine: dw-edma: Fix Using plain integer as NULL pointer in dw-edma-v0-debugfs.c
        ...
      f065199d
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/i2c-hid' into for-linus · 3504e85c
      Jiri Kosina authored
      - i2c-hid support for wakeup from suspend-to-idle
      3504e85c
    • Kai-Heng Feng's avatar
      HID: i2c-hid: Enable wakeup capability from Suspend-to-Idle · 203c38fb
      Kai-Heng Feng authored
      Many laptops can be woken up from Suspend-to-Idle by touchpad. This is
      also the default behavior on other OSes.
      
      However, if touchpad and touchscreen contact to each other when lid is
      closed, wakeup events can be triggered inadventertly.
      
      So let's disable the wakeup by default, but enable the wakeup capability
      so users can enable it at their own discretion.
      Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
      Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      203c38fb
    • Jiri Kosina's avatar
      Merge branch 'for-5.9/upstream-fixes' into for-linus · 9b14b066
      Jiri Kosina authored
      - "heartbeat" report fix for several Wacom devices
      - Lenovo X1 Tablet support improvements
      - new device IDs
      - bounds checking fix in hid-roccat
      - stylus battery reporting fix
      9b14b066
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/wiimote' into for-linus · 146f9d91
      Jiri Kosina authored
      - code cleanups for hid-wiimote
      146f9d91
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/vivaldi' into for-linus · df975502
      Jiri Kosina authored
      - driver for Vivaldi devices (keyboards which provide vendor-defined (Google)
        usages in their descriptor)
      df975502
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/intel-ish-hid' into for-linus · d61a5d63
      Jiri Kosina authored
      - intel-ish-hid code cleanup
      d61a5d63
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/i2c-hid' into for-linus · 1341c586
      Jiri Kosina authored
      - prefer async probing in i2c-hid even if built-in
      1341c586
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/cp2112' into for-linus · 1142a12c
      Jiri Kosina authored
      - make cp2112 driver use irqchip template properly
      1142a12c
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/core' into for-linus · 62b31a04
      Jiri Kosina authored
      - nonblocking read semantics fix for hid-debug
      62b31a04
    • Jiri Kosina's avatar
      Merge branch 'for-5.10/apple' into for-linus · cc51d171
      Jiri Kosina authored
      - support for Matias wireless (identifies itself as ISO RevB Alu)
      cc51d171
    • Linus Torvalds's avatar
      Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c48b75b7
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "The amount of changes is smaller at this round (what a surprise), but
        lots of activity is seen. Most of changes are about ASoC driver
        development, especially Intel platforms. Here are some highlights:
      
        General:
         - Replace all tasklet usages with other alternatives
         - Cleanup of the ASoC error unwinding code
         - Fixes for trivial issues caught by static checker
         - Spell fixes allover the places
      
        ALSA Core:
         - Lockdep fix for control devices
         - Fix for potential OSS sequencer mutex stalls
      
        HD-audio and USB-audio:
         - SoundBlaster AE-7 support
         - Changes in quirk table for the rename handling
         - Quirks for HP and ASUS machines, Pioneer DJ DJM-250MK2.
      
        ASoC:
         - Lots of updates for Intel SOF and SoundWire enablement
         - Replacement of the DSP driver for some older x86 systems; the new
           code was written from scratch, better maintenance expected
         - Helpers for parsing auxiluary devices from the device tree
         - New support for AllWinner A64, Cirrus Logic CS4234, Mediatek MT6359
           Microchip S/PDIF TX and RX controllers, Realtek RT1015P, and Texas
           Instruments J721E, TAS2110, TAS2564 and TAS2764"
      
      * tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (498 commits)
        ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close
        ALSA: hda: fix jack detection with Realtek codecs when in D3
        ALSA: fireworks: use semicolons rather than commas to separate statements
        ALSA: hda: use semicolons rather than commas to separate statements
        ALSA: hda/i915 - fix list corruption with concurrent probes
        ASoC: dmaengine: Document support for TX only or RX only streams
        ASoC: mchp-spdiftx: remove 'TX' from playback stream name
        ASoC: ti: davinci-mcasp: Use &pdev->dev for early dev_warn
        ASoC: tas2764: Add the driver for the TAS2764
        dt-bindings: tas2764: Add the TAS2764 binding doc
        ASoC: Intel: catpt: Add explicit DMADEVICES kconfig dependency
        ASoC: Intel: catpt: Fix compilation when CONFIG_MODULES is disabled
        ASoC: stm32: dfsdm: add actual resolution trace
        ASoC: stm32: dfsdm: change rate limits
        ASoC: qcom: sc7180: Add support for audio over DP
        Asoc: qcom: lpass-platform : Increase buffer size
        ASoC: qcom: Add support for lpass hdmi driver
        Asoc: qcom: lpass:Update lpaif_dmactl members order
        Asoc:qcom:lpass-cpu:Update dts property read API
        ASoC: dt-bindings: Add dt binding for lpass hdmi
        ...
      c48b75b7
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm · 93b694d0
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "Not a major amount of change, the i915 trees got split into display
        and gt trees to better facilitate higher level review, and there's a
        major refactoring of i915 GEM locking to use more core kernel concepts
        (like ww-mutexes). msm gets per-process pagetables, older AMD SI cards
        get DC support, nouveau got a bump in displayport support with common
        code extraction from i915.
      
        Outside of drm this contains a couple of patches for hexint
        moduleparams which you've acked, and a virtio common code tree that
        you should also get via it's regular path.
      
        New driver:
         - Cadence MHDP8546 DisplayPort bridge driver
      
        core:
         - cross-driver scatterlist cleanups
         - devm_drm conversions
         - remove drm_dev_init
         - devm_drm_dev_alloc conversion
      
        ttm:
         - lots of refactoring and cleanups
      
        bridges:
         - chained bridge support in more drivers
      
        panel:
         - misc new panels
      
        scheduler:
         - cleanup priority levels
      
        displayport:
         - refactor i915 code into helpers for nouveau
      
        i915:
         - split into display and GT trees
         - WW locking refactoring in GEM
         - execbuf2 extension mechanism
         - syncobj timeline support
         - GEN 12 HOBL display powersaving
         - Rocket Lake display additions
         - Disable FBC on Tigerlake
         - Tigerlake Type-C + DP improvements
         - Hotplug interrupt refactoring
      
        amdgpu:
         - Sienna Cichlid updates
         - Navy Flounder updates
         - DCE6 (SI) support for DC
         - Plane rotation enabled
         - TMZ state info ioctl
         - PCIe DPC recovery support
         - DC interrupt handling refactor
         - OLED panel fixes
      
        amdkfd:
         - add SMI events for thermal throttling
         - SMI interface events ioctl update
         - process eviction counters
      
        radeon:
         - move to dma_ for allocations
         - expose sclk via sysfs
      
        msm:
         - DSI support for sm8150/sm8250
         - per-process GPU pagetable support
         - Displayport support
      
        mediatek:
         - move HDMI phy driver to PHY
         - convert mtk-dpi to bridge API
         - disable mt2701 tmds
      
        tegra:
         - bridge support
      
        exynos:
         - misc cleanups
      
        vc4:
         - dual display cleanups
      
        ast:
         - cleanups
      
        gma500:
         - conversion to GPIOd API
      
        hisilicon:
         - misc reworks
      
        ingenic:
         - clock handling and format improvements
      
        mcde:
         - DSI support
      
        mgag200:
         - desktop g200 support
      
        mxsfb:
         - i.MX7 + i.MX8M
         - alpha plane support
      
        panfrost:
         - devfreq support
         - amlogic SoC support
      
        ps8640:
         - EDID from eDP retrieval
      
        tidss:
         - AM65xx YUV workaround
      
        virtio:
         - virtio-gpu exported resources
      
        rcar-du:
         - R8A7742, R8A774E1 and R8A77961 support
         - YUV planar format fixes
         - non-visible plane handling
         - VSP device reference count fix
         - Kconfig fix to avoid displaying disabled options in .config"
      
      * tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm: (1494 commits)
        drm/ingenic: Fix bad revert
        drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init
        drm/amdgpu: Remove warning for virtual_display
        drm/amdgpu: kfd_initialized can be static
        drm/amd/pm: setup APU dpm clock table in SMU HW initialization
        drm/amdgpu: prevent spurious warning
        drm/amdgpu/swsmu: fix ARC build errors
        drm/amd/display: Fix OPTC_DATA_FORMAT programming
        drm/amd/display: Don't allow pstate if no support in blank
        drm/panfrost: increase readl_relaxed_poll_timeout values
        MAINTAINERS: Update entry for st7703 driver after the rename
        Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached"
        drm/amd/display: HDMI remote sink need mode validation for Linux
        drm/amd/display: Change to correct unit on audio rate
        drm/amd/display: Avoid set zero in the requested clk
        drm/amdgpu: align frag_end to covered address space
        drm/amdgpu: fix NULL pointer dereference for Renoir
        drm/vmwgfx: fix regression in thp code due to ttm init refactor.
        drm/amdgpu/swsmu: add interrupt work handler for smu11 parts
        drm/amdgpu/swsmu: add interrupt work function
        ...
      93b694d0
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 726eb70e
      Linus Torvalds authored
      Pull char/misc driver updates from Greg KH:
       "Here is the big set of char, misc, and other assorted driver subsystem
        patches for 5.10-rc1.
      
        There's a lot of different things in here, all over the drivers/
        directory. Some summaries:
      
         - soundwire driver updates
      
         - habanalabs driver updates
      
         - extcon driver updates
      
         - nitro_enclaves new driver
      
         - fsl-mc driver and core updates
      
         - mhi core and bus updates
      
         - nvmem driver updates
      
         - eeprom driver updates
      
         - binder driver updates and fixes
      
         - vbox minor bugfixes
      
         - fsi driver updates
      
         - w1 driver updates
      
         - coresight driver updates
      
         - interconnect driver updates
      
         - misc driver updates
      
         - other minor driver updates
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (396 commits)
        binder: fix UAF when releasing todo list
        docs: w1: w1_therm: Fix broken xref, mistakes, clarify text
        misc: Kconfig: fix a HISI_HIKEY_USB dependency
        LSM: Fix type of id parameter in kernel_post_load_data prototype
        misc: Kconfig: add a new dependency for HISI_HIKEY_USB
        firmware_loader: fix a kernel-doc markup
        w1: w1_therm: make w1_poll_completion static
        binder: simplify the return expression of binder_mmap
        test_firmware: Test partial read support
        firmware: Add request_partial_firmware_into_buf()
        firmware: Store opt_flags in fw_priv
        fs/kernel_file_read: Add "offset" arg for partial reads
        IMA: Add support for file reads without contents
        LSM: Add "contents" flag to kernel_read_file hook
        module: Call security_kernel_post_load_data()
        firmware_loader: Use security_post_load_data()
        LSM: Introduce kernel_post_load_data() hook
        fs/kernel_read_file: Add file_size output argument
        fs/kernel_read_file: Switch buffer size arg to size_t
        fs/kernel_read_file: Remove redundant size argument
        ...
      726eb70e
    • Linus Torvalds's avatar
      Merge tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c6dbef73
      Linus Torvalds authored
      Pull USB/PHY/Thunderbolt driver updates from Greg KH:
       "Here is the big set of USB, PHY, and Thunderbolt driver updates for
        5.10-rc1.
      
        Lots of tiny different things for these subsystems are in here,
        including:
      
         - phy driver updates
      
         - thunderbolt / USB 4 updates and additions
      
         - USB gadget driver updates
      
         - xhci fixes and updates
      
         - typec driver additions and updates
      
         - api conversions to various drivers for core kernel api changes
      
         - new USB control message functions to make it harder to get wrong,
           as found by syzbot (took 2 tries to get it right)
      
         - lots of tiny USB driver fixes and updates all over the place
      
        All of these have been in linux-next for a while, with the exception
        of the last "obviously correct" patch that updated a FALLTHROUGH
        comment that got merged last weekend"
      
      * tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (374 commits)
        usb: musb: gadget: Use fallthrough pseudo-keyword
        usb: typec: Add QCOM PMIC typec detection driver
        USB: serial: option: add Cellient MPL200 card
        usb: typec: tcpci_maxim: Add support for Sink FRS
        usb: typec: tcpci: Implement callbacks for FRS
        usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)
        usb: typec: tcpci_maxim: Chip level TCPC driver
        usb: typec: tcpci: Add set_vbus tcpci callback
        usb: typec: tcpci: Add a getter method to retrieve tcpm_port reference
        usbip: vhci_hcd: fix calling usb_hcd_giveback_urb() with irqs enabled
        usb: cdc-acm: add quirk to blacklist ETAS ES58X devices
        USB: serial: ftdi_sio: use cur_altsetting for consistency
        USB: serial: option: Add Telit FT980-KS composition
        USB: core: remove polling for /sys/kernel/debug/usb/devices
        usb: typec: add support for STUSB160x Type-C controller family
        usb: typec: add typec_find_pwr_opmode
        usb: typec: hd3ss3220: Use OF graph API to get the connector fwnode
        dt-bindings: usb: renesas,usb3-peri: Document HS and SS data bus
        dt-bindings: usb: convert ti,hd3ss3220 bindings to json-schema
        usb: dwc2: Fix INTR OUT transfers in DDMA mode.
        ...
      c6dbef73
    • Linus Torvalds's avatar
      Merge tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · ade7afe3
      Linus Torvalds authored
      Pull staging / IIO driver updates from Greg KH:
       "Here is the large set of staging and IIO driver updates for 5.10-rc1.
      
        Included in here are:
      
         - new IIO drivers
      
         - new IIO driver frameworks
      
         - various IIO driver fixes and updates
      
         - IIO device tree conversions to yaml
      
         - so many minor staging driver coding style cleanups
      
         - most cdev driver moved out of staging
      
         - no staging drivers added or removed
      
        Full details are in the shortlog.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (476 commits)
        staging: comedi: check validity of wMaxPacketSize of usb endpoints found
        staging: wfx: improve robustness of wfx_get_hw_rate()
        staging: wfx: drop unicode characters from strings
        staging: wfx: gpiod_get_value() can return an error
        staging: wfx: increase robustness of hif_generic_confirm()
        staging: wfx: wfx_init_common() returns NULL on error
        staging: wfx: standardize the error when vif does not exist
        staging: wfx: check memory allocation
        staging: wfx: improve error handling of hif_join()
        staging: dpaa2-switch: add a dpaa2_switch prefix to all functions in ethsw.c
        staging: dpaa2-switch: add a dpaa2_switch_ prefix to all functions in ethsw-ethtool.c
        staging: rtl8188eu: Fix long lines
        dt-bindings: staging: wfx: silabs,wfx yaml conversion
        staging: wfx: update copyrights dates
        staging: wfx: fix QoS priority for slow buses
        staging: wfx: fix BA sessions for older firmwares
        staging: wfx: remove remaining code of 'secure link' feature
        staging: wfx: fix handling of MMIC error
        staging: vchiq: Fix list_for_each exit tests
        staging: greybus: use __force when assigning __u8 value to snd_ctl_elem_type_t
        ...
      ade7afe3
  7. 14 Oct, 2020 9 commits
    • Linus Torvalds's avatar
      Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx · 3e4fb434
      Linus Torvalds authored
      Pull SPDX updates from Greg KH:
       "Here are some SPDX-specific changes for 5.10-rc1.
      
        They include:
      
         - driver fixes to make spdxcheck.pl work properly
      
         - add GFDL licenses as "deprecated" but required due to some of our
           documentation using them
      
         - add Zlib license as "deprecated" but required because we have code
           with this license in the tree.
      
         - convert some drivers to have SPDX identifiers that previously
           didn't have them.
      
        All have been in linux-next for a very long time with no reported
        issues"
      
      * tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
        scripts/spdxcheck.py: handle license identifiers in XML comments
        net/mlx5: IPsec: make spdxcheck.py happy
        LICENSES/deprecated: add Zlib license text
        LICENSE: add GFDL deprecated licenses
        net/qla3xxx: Convert to SPDX license identifiers
        net/qlge: Convert to SPDX license identifiers
        net/qlcnic: Convert to SPDX license identifiers
        scsi/qla2xxx: Convert to SPDX license identifiers
        scsi/qla4xxx: Convert to SPDX license identifiers
      3e4fb434
    • Linus Torvalds's avatar
      Merge tag 'driver-core-5.10-rc1' of... · fe151462
      Linus Torvalds authored
      Merge tag 'driver-core-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core updates from Greg KH:
       "Here is the "big" set of driver core patches for 5.10-rc1
      
        They include a lot of different things, all related to the driver core
        and/or some driver logic:
      
         - sysfs common write functions to make it easier to audit sysfs
           attributes
      
         - device connection cleanups and fixes
      
         - devm helpers for a few functions
      
         - NOIO allocations for when devices are being removed
      
         - minor cleanups and fixes
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'driver-core-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (31 commits)
        regmap: debugfs: use semicolons rather than commas to separate statements
        platform/x86: intel_pmc_core: do not create a static struct device
        drivers core: node: Use a more typical macro definition style for ACCESS_ATTR
        drivers core: Use sysfs_emit for shared_cpu_map_show and shared_cpu_list_show
        mm: and drivers core: Convert hugetlb_report_node_meminfo to sysfs_emit
        drivers core: Miscellaneous changes for sysfs_emit
        drivers core: Reindent a couple uses around sysfs_emit
        drivers core: Remove strcat uses around sysfs_emit and neaten
        drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
        sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
        dyndbg: use keyword, arg varnames for query term pairs
        driver core: force NOIO allocations during unplug
        platform_device: switch to simpler IDA interface
        driver core: platform: Document return type of more functions
        Revert "driver core: Annotate dev_err_probe() with __must_check"
        Revert "test_firmware: Test platform fw loading on non-EFI systems"
        iio: adc: xilinx-xadc: use devm_krealloc()
        hwmon: pmbus: use more devres helpers
        devres: provide devm_krealloc()
        syscore: Use pm_pr_dbg() for syscore_{suspend,resume}()
        ...
      fe151462
    • Linus Torvalds's avatar
      Merge tag 'tty-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 5d6c413c
      Linus Torvalds authored
      Pull tty/serial updates from Greg KH:
       "Here is the big set of tty and serial driver patches for 5.10-rc1.
      
        Lots of little things in here, including:
      
         - tasklet_setup api conversions
      
         - sysrq support for capital letters
      
         - vt and vc cleanups and unwinding the mess some more
      
         - serial driver updates and minor tweaks
      
         - new device ids
      
         - rs485 support for some drivers
      
         - serial binding documentation updates
      
         - lots of small serial driver changes for reported issues
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'tty-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
        serial: mcf: add sysrq capability
        serial: fsl_lpuart: add sysrq support when using dma
        fbcon: remove no-op fbcon_set_origin()
        tty/sysrq: Extend the sysrq_key_table to cover capital letters
        serial: max310x: rework RX interrupt handling
        serial: 8250_dw: Fix clk-notifier/port suspend deadlock
        serial: 8250: Skip uninitialized TTY port baud rate update
        serial: 8250: Discard RTS/DTS setting from clock update method
        tty: serial: imx: disable TXDC IRQ in imx_uart_shutdown() to avoid IRQ storm
        serial: 8250_fsl: Fix TX interrupt handling condition
        serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt
        tty: serial: fsl_lpuart: fix lpuart32_poll_get_char
        tty: serial: lpuart: fix lpuart32_write usage
        serial: qcom_geni_serial: To correct QUP Version detection logic
        serial: mvebu-uart: fix unused variable warning
        vt_ioctl: make VT_RESIZEX behave like VT_RESIZE
        serial: mvebu-uart: simplify the return expression of mvebu_uart_probe()
        tty: serial: imx: fix link error with CONFIG_SERIAL_CORE_CONSOLE=n
        tty: hvc: fix link error with CONFIG_SERIAL_CORE_CONSOLE=n
        pch_uart: drop double zeroing
        ...
      5d6c413c
    • Jason A. Donenfeld's avatar
      powerpc32: don't adjust unmoved stack pointer in csum_partial_copy_generic() epilogue · e6037a75
      Jason A. Donenfeld authored
      A recent change to the checksum code removed usage of some extra
      arguments, alongside with storage on the stack for those, and the stack
      pointer no longer needed to be adjusted in the function prologue.
      
      But a left over subtraction wasn't removed in the function epilogue,
      causing the function to return with the stack pointer moved 16 bytes
      away from where it should have.  This corrupted local state and lead to
      weird crashes.
      
      This simply removes the leftover instruction from the epilogue.
      
      Fixes: 70d65cd5 ("ppc: propagate the calling conventions change down to csum_partial_copy_generic()")
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6037a75
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 6448cbf6
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "New Drivers:
         - Add support for KTD253
      
        Fix-ups:
         - Add Device Tree documentation; common, kinetic,ktd253
         - Use correct header(s); tosa_lcd, tosa_bl
      
        Bug Fixes:
         - Fix refcount imbalance; sky81452-backlight"
      
      * tag 'backlight-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: tosa_bl: Include the right header
        backlight: tosa_lcd: Include the right header
        backlight: Add Kinetic KTD253 backlight driver
        dt-bindings: backlight: Add Kinetic KTD253 bindings
        dt-bindings: backlight: Add some common backlight properties
        backlight: sky81452-backlight: Fix refcount imbalance on error
      6448cbf6
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 1a31c123
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Drivers:
         - Add support for initialising shared (between children) Regmaps
         - Add support for Kontron SL28CPLD
         - Add support for ENE KB3930 Embedded Controller
         - Add support for Intel FPGA PAC MAX 10 BMC
      
        New Device Support:
         - Add support for Power to Ricoh RN5T618
         - Add support for UART to Intel Lakefield
         - Add support for LP87524_Q1 to Texas Instruments LP87565
      
        New Functionality:
         - Device Tree; ene-kb3930, sl28cpld, syscon, lp87565, lp87524-q1
         - Use new helper dev_err_probe(); madera-core, stmfx, wcd934x
         - Use new GPIOD API; dm355evm_msp
         - Add wake-up capability; sprd-sc27xx-spi
         - Add ACPI support; kempld-core
      
        Fix-ups:
         - Trivial (spelling/whitespace); Kconfig, ab8500
         - Fix for unused variables; khadas-mcu, kempld-core
         - Remove unused header file(s); mt6360-core
         - Use correct IRQ flags in docs; act8945a, gateworks-gsc, rohm,bd70528-pmic
         - Add COMPILE_TEST support; asic3, tmio_core
         - Add dependency on I2C; SL28CPLD
      
        Bug Fixes:
         - Fix memory leak(s); sm501
         - Do not free regmap_config's 'name' until exit; syscon"
      
      * tag 'mfd-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (34 commits)
        mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI
        mfd: sl28cpld: Depend on I2C
        mfd: asic3: Build if COMPILE_TEST=y
        dt-bindings: mfd: Correct interrupt flags in examples
        mfd: Add ACPI support to Kontron PLD driver
        mfd: intel-m10-bmc: Add Intel MAX 10 BMC chip support for Intel FPGA PAC
        mfd: lp87565: Add LP87524-Q1 variant
        dt-bindings: mfd: Add LP87524-Q1
        dt-bindings: mfd: lp87565: Convert to yaml
        mfd: mt6360: Remove unused include <linux/version.h>
        mfd: sm501: Fix leaks in probe()
        mfd: syscon: Don't free allocated name for regmap_config
        dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles
        dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings
        dt-bindings: mfd: ab8500: Remove weird Unicode characters
        mfd: sprd: Add wakeup capability for PMIC IRQ
        mfd: intel-lpss: Add device IDs for UART ports for Lakefield
        mfd: dm355evm_msp: Convert LEDs to GPIO descriptor table
        mfd: wcd934x: Simplify with dev_err_probe()
        mfd: stmfx: Simplify with dev_err_probe()
        ...
      1a31c123
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · f888bdf9
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
      
       - Update dtc to upstream version v1.6.0-31-gcbca977ea121
      
       - dtx_diff help text reformatting
      
       - Speed-up validation time for binding and dtb checks using json for
         intermediate files
      
       - Add support for running yamllint on DT schema files
      
       - Remove old booting-without-of.rst
      
       - Extend the example schema to address common issues
      
       - Cleanup handling of additionalProperties/unevaluatedProperties
      
       - Ensure all DSI controller schemas reference dsi-controller.yaml
      
       - Vendor prefixes for Zealz, Wandbord/Technexion, Embest RIoT, Rex,
         DFI, and Cisco Meraki
      
       - Convert at25, SPMI bus, TI hwlock, HiSilicon Hi3660 USB3 PHY, Arm
         SP805 watchdog, Arm SP804, and Samsung 11-pin USB connector to DT
         schema
      
       - Convert HiSilicon SoC and syscon bindings to DT schema
      
       - Convert SiFive Risc-V L2 cache, PLIC, PRCI, and PWM to DT schema
      
       - Convert i.MX bindings for w1, crypto, rng, SIM, PM, DDR, SATA, vf610
         GPIO, and UART to DT schema
      
       - Add i.MX 8M compatible strings
      
       - Add LM81 and DS1780 as trivial devices
      
       - Various missing properties added to fix dtb validation warnings
      
      * tag 'devicetree-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (111 commits)
        dt-bindings: misc: explicitly add #address-cells for slave mode
        spi: dt-bindings: spi-controller: explicitly require #address-cells=<0> for slave mode
        dt: Remove booting-without-of.rst
        dt-bindings: update usb-c-connector example
        dt-bindings: arm: hisilicon: add missing properties into cpuctrl.yaml
        dt-bindings: arm: hisilicon: add missing properties into sysctrl.yaml
        dt-bindings: pwm: imx: document i.MX compatibles
        scripts/dtc: Update to upstream version v1.6.0-31-gcbca977ea121
        dt-bindings: Add running yamllint to dt_binding_check
        dt-bindings: powerpc: Add a schema for the 'sleep' property
        dt-bindings: pinctrl: sirf: Fix typo abitrary
        dt-bindings: pinctrl: qcom: Fix typo abitrary
        dt-bindings: Explicitly allow additional properties in common schemas
        dt-bindings: Use 'additionalProperties' instead of 'unevaluatedProperties'
        dt-bindings: Add missing 'unevaluatedProperties'
        Docs: Fixing spelling errors in Documentation/devicetree/bindings/
        dt-bindings: arm: hisilicon: convert Hi6220 domain controller bindings to json-schema
        dt-bindings: riscv: convert pwm bindings to json-schema
        dt-bindings: riscv: convert plic bindings to json-schema
        dt-bindings: fu540: prci: convert PRCI bindings to json-schema
        ...
      f888bdf9
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · b4e1bce8
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "Core changes:
      
         - NONE whatsoever, we don't even touch the core files this time
           around.
      
        New drivers:
      
         - New driver for the Toshiba Visconti SoC.
      
         - New subdriver for the Qualcomm MSM8226 SoC.
      
         - New subdriver for the Actions Semiconductor S500 SoC.
      
         - New subdriver for the Mediatek MT8192 SoC.
      
         - New subdriver for the Microchip SAMA7G5 SoC.
      
        Driver enhancements:
      
         - Intel Cherryview and Baytrail cleanups and refactorings.
      
         - Enhanced support for the Renesas R8A7790, more pins and groups.
      
         - Some optimizations for the MCP23S08 MCP23x17 variant.
      
         - Some cleanups around the Actions Semiconductor subdrivers.
      
         - A bunch of cleanups around the SH-PFC and Emma Mobile drivers.
      
         - The "SH-PFC" (literally SuperH pin function controller, I think)
           subdirectory is now renamed to the more neutral "renesas", as these
           are not very much centered around SuperH anymore.
      
         - Non-critical fixes for the Aspeed driver.
      
         - Non-critical fixes for the Ingenic (MIPS!) driver.
      
         - Fix a bunch of missing pins on the AMD pinctrl driver"
      
      * tag 'pinctrl-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (78 commits)
        pinctrl: amd: Add missing pins to the pin group list
        dt-bindings: pinctrl: sunxi: Allow pinctrl with more interrupt banks
        pinctrl: visconti: PINCTRL_TMPV7700 should depend on ARCH_VISCONTI
        pinctrl: mediatek: Free eint data on failure
        pinctrl: single: fix debug output when #pinctrl-cells = 2
        pinctrl: single: fix pinctrl_spec.args_count bounds check
        pinctrl: sunrisepoint: Modify COMMUNITY macros to be consistent
        pinctrl: cannonlake: Modify COMMUNITY macros to be consistent
        pinctrl: tigerlake: Fix register offsets for TGL-H variant
        pinctrl: Document pinctrl-single,pins when #pinctrl-cells = 2
        pinctrl: mediatek: use devm_platform_ioremap_resource_byname()
        pinctrl: nuvoton: npcm7xx: Constify static ops structs
        pinctrl: mediatek: mt7622: add antsel pins/groups
        pinctrl: ocelot: simplify the return expression of ocelot_gpiochip_register()
        pinctrl: at91-pio4: add support for sama7g5 SoC
        dt-bindings: pinctrl: at91-pio4: add microchip,sama7g5
        pinctrl: spear: simplify the return expression of tvc_connect()
        pinctrl: spear: simplify the return expression of spear310_pinctrl_probe
        pinctrl: sprd: use module_platform_driver to simplify the code
        pinctrl: Ingenic: Add I2S pins support for Ingenic SoCs.
        ...
      b4e1bce8
    • Linus Torvalds's avatar
      Merge tag 'leds-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds · 7fafb54c
      Linus Torvalds authored
      Pull LED updates from Pavel Machek:
       "Quite a lot of stuff is going on here. Great cleanups/fixes from Marek
        and others are biggest part.
      
        I limited CPU LED trigger to 8 LEDs, because it was willing to
        register 1024 'triggers' on machine with 1024 CPUs. I don't believe it
        will cause any problems, but we can raise the limit if it does"
      
      * tag 'leds-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds: (84 commits)
        leds: pwm: Remove platform_data support
        leds: lm3697: Fix out-of-bound access
        leds: ns2: do not guard OF match pointer with of_match_ptr
        leds: ns2: convert to fwnode API
        leds: tlc591xx: fix leak of device node iterator
        leds: pca963x: use struct led_init_data when registering
        leds: pca963x: register LEDs immediately after parsing, get rid of platdata
        leds: tca6507: remove binding comment
        leds: tca6507: cosmetic change: use helper variable
        leds: tca6507: do not set GPIO names
        dt-bindings: leds: tca6507: convert to YAML
        ledtrig-cpu: Limit to 8 CPUs
        leds: TODO: Add documentation about possible subsystem improvements
        leds: pca9532: read pwm settings from device tree
        leds: pca9532: correct shift computation in pca9532_getled
        leds: lm36274: Fix warning for undefined parameters
        leds: lm3532: Fix warnings for undefined parameters
        leds: pca963x: use flexible array
        leds: pca963x: cosmetic: rename variables
        leds: pca963x: cosmetic: rename variables
        ...
      7fafb54c