tree 83c189c70d7880639ab0c8f59c3e84f5c5f8dfd3
parent f00103486c895d55db2387c528a02f23a4396e4c
parent 2c691e37dfedf1ad0e3d6e1719204f3a10d333f0
author Alexander Martinz <amartinz@shiftphones.com> 1701085427 +0100
committer Alexander Martinz <amartinz@shiftphones.com> 1701085687 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEioN3RtFSeUXyJOKbzxW92aMhqbIFAmVkghcACgkQzxW92aMh
 qbK6aQ/+JBgwox1au198Z3gS1cxd7jvKgxR7U4YAbt8nRCctVD89VBD8iA/RMrG0
 vLfrcFsZ/e3m4y2WG8gLPvwGZPu4AHMVFyjHy7mwhDZI/abSbf/9AoTvkYLUdcJ8
 wRfqOIBm7q6DKJyOMCbQLtprPDh0wAcnijaZ4IgJdP+4/bqD2ejnDRilf3xWJ/kM
 dKNtAsHEGjprKAogKtwmRCjOqGP26xXqP7GrdBWoL3iBGX/e8LAu1SEoOLNIKGTf
 VBuXZjbaK1YsZlPUJL+L6hi2TEUdJxSB/as4iMRjQZmfdelbJyERR71s5ApTasSz
 F0nvjxp6VLBamwqRk8fL9g5YrWXOKGm9UoPr4nIsrfWeOVTWuc1NSbzhAFQQwkfj
 K5yEcx5G+t/zy2QRo2811DYBuh9TMZFlqgeZPhzix6utS0wGVf7TNv66qR027bt8
 IChM9a68MxOU98xxtnC+doZ671KWJaitM1vXA6rFQVtUnQqX7jlEtc26hx+XHmOq
 xvwhVXdORrALQX/G+UFafQx4fzpiJy5Z/7hKw6sj60wadL1kESitntcZ0urbXSFg
 gRWeP50/muJDGVeCdQgOTTGl9DrwJ/UwgMyHwflvm/mOzwWX20SoWz1AclgfwBph
 SstnN3AD9cO21FoW4zJ8R5FmksPI916fA5US8NmHwA39htnx+NA=
 =6WTi
 -----END PGP SIGNATURE-----

Merge tag 'LA.UM.10.3.c25-00400-sdm845.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.9 into android13-4.9-sdm845

"LA.UM.10.3.c25-00400-sdm845.0"

-----

Merge list:

2c691e37 msm: kgsl: Zap performance counters across context switches
cc4445fc msm: kgsl: Add a sysfs node to control performance counter reads
d43346f6 Merge 975d708f8613e08048ceddeedae69c6bbdfa00b1 on remote branch
975d708f Merge "msm: camera: reqmgr: reader writer locks to avoid memory faults"
4d3d93cb diag: Validate the dci client before sending dci packet
c1281451 msm: camera: reqmgr: reader writer locks to avoid memory faults
886ff86e Merge "msm: camera: reqmgr: reader writer locks to avoid memory faults"
199b0eae diag: Ensure dci entry is valid before sending the packet
6f0d0c6b msm: camera: cdm: Acquire mutex lock before accessing client data
3064ec89 msm: camera: reqmgr: reader writer locks to avoid memory faults

-----

The kgsl patches above are already included.

Conflicts:
- drivers/gpu/msm/adreno.h
- drivers/gpu/msm/adreno_a6xx_preempt.c

Change-Id: I1795b0c91be002fd70435c6e1787b354fd5bdc3d
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>