On Wed, Jun 19, 2024 at 02:40:04PM +0100, Charles Keepax wrote: > On Wed, Jun 19, 2024 at 02:30:33PM +0100, Mark Brown wrote: > > That's because when I told you that the second patch didn't apply I left > > the other one in the queue, and what you sent now didn't apply either. > Hmm... what branch are you applying this to? Pulling the patch > off the list and git am-ing it onto your spi for-next branch > works fine for me. Nothing gets applied to for-next or for-linus, they get applied to the version specific branches or sometimes a topic branch. Those two branches are constantly regenerated merges. > I mean I can just resend it but presumably we will hit the same > issue again. I didn't mail you yet because I didn't look at trying to figure out what it might apply to.
Attachment:
signature.asc
Description: PGP signature