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 S1752414AbdGEKUM (ORCPT <rfc822;w@1wt.eu>);
        Wed, 5 Jul 2017 06:20:12 -0400
Received: from mezzanine.sirena.org.uk ([106.187.55.193]:46836 "EHLO
        mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750841AbdGEKUK (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 5 Jul 2017 06:20:10 -0400
Date: Wed, 5 Jul 2017 11:19:50 +0100
From: Mark Brown <broonie@kernel.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: Rob Herring <robh@kernel.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Message-ID: <20170705101950.rjgio6qms2o7zdfk@sirena.org.uk>
References: <20170623122534.3303f515@canb.auug.org.au>
 <s5hr2xwdw0i.wl-tiwai@suse.de>
 <CAL_Jsq+sYxWq+Y1=iGtLk4hSQWXJBQ7LJVh9FbsOMshKzqjKcw@mail.gmail.com>
 <2002105.224HtT5E8x@aspire.rjw.lan>
 <s5hshibbalq.wl-tiwai@suse.de>
 <s5hmv8jb8tz.wl-tiwai@suse.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="wesjx4gjntuxxnnq"
Content-Disposition: inline
In-Reply-To: <s5hmv8jb8tz.wl-tiwai@suse.de>
X-Cookie: Youth is the trustee of posterity.
User-Agent: NeoMutt/20170306 (1.8.0)
X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3
X-SA-Exim-Mail-From: broonie@sirena.org.uk
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree
X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000)
X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


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

On Wed, Jul 05, 2017 at 10:12:56AM +0200, Takashi Iwai wrote:

> For your convenience, I branched off topic/of-graph-base that contains
> only the minimal set of commits that conflict with drivers/of/*.
> Feel free to use this branch instead of the branches above.

I did suggest doing this when the conflict originally came up :(

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

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

iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAllcvUYACgkQJNaLcl1U
h9Cjygf/RZpYnkGu64X6ib6b2UDLoDVxRBQbgVmnRIzIV1+9v+paRrejX7JN1Eq5
mmfl5tw7QlGrQY8twS5zKwWtkslZRBy4YCKeBA39s3XZl+yfAdiD7sQBn6qGS4MQ
e8q42fJVWeurX/synklwlaT2NsK2fggytgZ/+g69vFnlem4LEfqkjyQP+aS4voJX
jM0mGG0mHuHhggkf4UXGrcPQQNJT/5zpMz7tVRaZa1j7EmDKqM5hWgtKpfavE+Wz
zyGqIbM/9a3QzKRBEZSv0RzMBZdY9h1Q4bmlJvbGssvPMbj6WbccL8poYwjMrb7s
8A/wz4Z7RTQ2YmgzGNVXRjWqNzSY5Q==
=7bO9
-----END PGP SIGNATURE-----

--wesjx4gjntuxxnnq--