@derfelot This is the commit you reverted in #82 due to issues with the merge. It includes the conflict resolution I used in my 17-19 branches which work for me.
Just thought you may find this useful to avoid further conflicts when merging the next CIP tags.
derfelot
commented
1 year ago
@derfelot This is the commit you reverted in #82 due to issues with the merge. It includes the conflict resolution I used in my 17-19 branches which work for me.
Just thought you may find this useful to avoid further conflicts when merging the next CIP tags.
See https://github.com/whatawurst/android_kernel_sony_msm8998/pull/82#issuecomment-1440463428 for reasoning on the difference