Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ecda3438 authored by derfelot's avatar derfelot
Browse files

Merge CAF tag LA.UM.8.4.1.r1-02900-8x98.0

* tag 'LA.UM.8.4.1.r1-02900-8x98.0':
  soc: add proxy ports for call screening in machine driver
  binder: fix UAF when releasing todo list
  msm: kgsl: Compare pid pointer instead of TGID for a new process
  RM: dts: msm: add CPU dai for additional proxy ports
  defconfig: Enable CONFIG_UTS_NS for msm8998
  defconfig: Enable UTS_NS for sdm660
  FROMLIST: HID: nintendo: add nintendo switch controller driver
  defconfig: Enable CONFIG_HID_NINTENDO for SDM660
  power_supply: add FG_RESET_CLOCK property
  msm: ipa3: Add check to validate rule_cnt
  power: qpnp-fg-gen3: Add a property to reset FG BCL device
  qcom: fg-memif: Correct timeout condition for memory grant
  iio: qcom-rradc: Update logic to monitor health of RRADC peripheral
  defconfig: Enable CONFIG_HID_NINTENDO for msm8998
  HID: input: ignore the battery in OKLICK Laser BTmouse
  UPSTREAM: HID: input: map digitizer battery usage
  HID: sony: Update hid_have_special_driver
  msm: kgsl: Correct the refcount on current process PID
  msm: kgsl: Stop using memdesc->usermem
  msm: kgsl: Protect the memdesc->gpuaddr in SVM use cases
  ipv6: addrconf: use stable address generator for ARPHRD_NONE

Conflicts:
	drivers/hid/Makefile
	drivers/power/power_supply_sysfs.c
	drivers/power/supply/qcom/qpnp-fg-gen3.c
	include/linux/power_supply.h
parents 0c593672 f917e762
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment