On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@xxxxxxxxxx wrote: > I generated the patch based on the mainline branch, > Why would there be a conflict? I know that I made a change to > this file when I committed aw87390 and that > the change was in the Linux-next branch, but the two > changes are in different parts of the file. I don't know off hand, I didn't check in detail. It's possible someone else sent a fix that's been applied and is causing the issue - if you check out my branch and try to apply the patches hopefully you can figure out what the problem was.
Attachment:
signature.asc
Description: PGP signature
