Messages in this thread | | | Date | Mon, 16 Oct 2017 21:01:54 +0100 | From | Mark Brown <> | Subject | Re: linux-next: manual merge of the akpm tree with the tip tree |
| |
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. [unhandled content-type:application/pgp-signature] | |