On Mon, Oct 16, 2017 at 07:48:10PM +0100, Mark Brown wrote: > I don't feel confident fixing this up, I'm trying to figure out how to > drop one of the commits but this script isn't the clearest in it's > intent.
OK, I might've figured it out or I might've made a terrible mess. Either way it seems to pass a basic smoke test. Later on in the merge process I also found additional conflicts, including extensive conflicts which look like reformatting issues in btrfs.
signature.asc
Description: PGP signature
