From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1756197AbdJPUB6 (ORCPT <rfc822;w@1wt.eu>);
        Mon, 16 Oct 2017 16:01:58 -0400
Received: from heliosphere.sirena.org.uk ([172.104.155.198]:53436 "EHLO
        heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752107AbdJPUB4 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 16 Oct 2017 16:01:56 -0400
Date: Mon, 16 Oct 2017 21:01:54 +0100
From: Mark Brown <broonie@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
        Ingo Molnar <mingo@kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the tip tree
Message-ID: <20171016200154.kc2dbifa757jfzzr@sirena.co.uk>
References: <20171016184810.24tuzkualecniicu@sirena.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="ou7xsjbjdzacdiow"
Content-Disposition: inline
In-Reply-To: <20171016184810.24tuzkualecniicu@sirena.co.uk>
X-Cookie: Whatever became of eternal truth?
User-Agent: NeoMutt/20170609 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


--ou7xsjbjdzacdiow
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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.

--ou7xsjbjdzacdiow
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnlEDEACgkQJNaLcl1U
h9AtRQf/agYYD/wiaBjND4bEjB9F6+LK0YTRsvM2MVMLTbWxbQLDkQHriY+rcHHI
5/Fcx7T6WzAQF5rADJ9LvQKThev28CUsyR+AKG1SRntpK1vBURKnLM5yHuQJfu6p
KodJcyl8gTYOg4B5bjjJITLVcK/9dBCiKMqfOwXwVTr3Br48D9rpiaGL931UURsO
nMPqMZI6BtXfGmNf6x6jUZwyvqcF6aWde+dTKx2WZeqy4deZ5NGmqWRM+4vpcytw
xRSO8W6qQRWW8V777oh+HH5LoCXJgKLXTrcahJsK98lCOwDbU8rT5uD03fKtYkSQ
ym4khzQQbDLeIZ+QJOKMu8ARiu+0MQ==
=vuD8
-----END PGP SIGNATURE-----

--ou7xsjbjdzacdiow--