On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote: > On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote: > > I'm don't feel confident I can resolve this conflict sensibly without > > taking too long so I've used the tip tree from yesterday. > It's a shame that the conflict is so messy -- most of it is just context > because that file has changed a lot in the s390 tree so the cleanup doesn't > apply. I resolved it below. Thanks, I'll give that a spin today. It did look like it should be fine but it was such a mess I didn't want to try to resolve by hand.
Attachment:
signature.asc
Description: PGP signature
