kernel: Merge tag 'LA.UM.10.6.2.r1-01900-89xx.0' into a11/LA.UM.10.6.2.r1
"LA.UM.10.6.2.r1-01900-89xx.0"
It creates merge conflict? Yes, but we'd be preferring checkout --theirs tho.
* tag 'bdfc212259c7b292aaa1704b4eb01818944bb17a':
msm: camera: reqmgr: Avoid freeing subdev twice
fbdev: msm: check for valid fence before using objects
msm: drm/dp: enable HDCP in DisplayPort driver
msm: mdp3: fix the use after free problem
drm/dp: fix DPCD arbitration with CEC
msm: kgsl: Zap performance counters across context switches
msm: kgsl: Add a sysfs node to control performance counter reads
disp: gpu: drm: The DUT shall not have retried more than 5 times
soc: spcom: Pass channel name as formatted string to device_create
msm: camera: reqmgr: Avoid freeing subdev twice
msm: kgsl: Zap performance counters across context switches
msm: kgsl: Add a sysfs node to control performance counter reads
media: cec: cec_transmit_attempt_done: ignore CEC_TX_STATUS_MAX_RETRIES
Revert "uapi/media: Support for Interlaced UBWC format"
Input: uinput - avoid FF flush when destroying device
Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation
Conflicts:
include/uapi/media/msm_media_info.h
Signed-off-by: Albert I <kras@raphielgang.org>
Loading
Please register or sign in to comment