We have a custom r36.4.7 with v5.15.198, but we’d like to merge the newer r36.5. However, since this is built on a lower kernel, we will have some obvious issues. When trying to come up with a way to resolve this, I noticed that r36.5 has rebased commits onto 5.15.0-105.115 compared to 5.15.0-153.163 for r36.4.7. Was there a reason for this? Because we’re facing a very large # of merge conflicts. And if anyone has a good merge strategy to share, let me know.
Hi,
It may be misaligned because we have different branches for r36.4.7 and r36.5 internally. Would suggest base on r36.5 to merge the conflicts. Or you may stay on r36.4.7, and manually apply the PSIRT patches:
Making sure you're not a bot!