Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbdFNObJ (ORCPT ); Wed, 14 Jun 2017 10:31:09 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:58370 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750717AbdFNObH (ORCPT ); Wed, 14 Jun 2017 10:31:07 -0400 Date: Wed, 14 Jun 2017 15:30:55 +0100 From: Mark Brown To: Rob Herring Cc: Stephen Rothwell , Sakari Ailus , Linux-Next Mailing List , Linux Kernel Mailing List , Kuninori Morimoto Message-ID: <20170614143055.5v6j4i5au3t3fw7s@sirena.org.uk> References: <20170614125423.48266e23@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="glxsbqjrgyhckia6" Content-Disposition: inline In-Reply-To: X-Cookie: Life is the urge to ecstasy. 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 devicetree tree with the sound-asoc tree X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1193 Lines: 32 --glxsbqjrgyhckia6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jun 14, 2017 at 08:55:37AM -0500, Rob Herring wrote: > Sakari, I forgot about these other changes and the resolution is more > complex than I want to pass on to Linus. Has the branch I provided > been pulled in (I guess not since this is the first I've seen of the > conflict)? We should drop the move for now and do it late in the merge > window or post -rc1. It can be after your other changes. I can send you a pull request for the changes in my tree so you can do the resolution if that helps? --glxsbqjrgyhckia6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAllBSJ8ACgkQJNaLcl1U h9BMnQf8C2c4dBOP+WmmxLyZhAq0ZYHAj30Ryjz5mCh6lyw8rtdTMsertJ17EzL2 EHDErB8w2qST7qmhWLCTHsh1T5Jn+Jhg4CKHBndyW9AH6+2AN2mOhucyKggyikaO Hjmg4JQFX8XRHkxWDscWYOTGvgzszOQfVWc32KFhIw6ScavZ4rm7mtUeRPJso8FC /yHnsvEo3g9bNq5YJxjZIqXoq82WpnhjC6ztIHYiuYIpl++WFjKiqU4sWN7cuH9k BpHtvpgfbRwv8J1frW6C9pzfF2o+70ekY4eDvC1fx0D03oYKuBe/0g/Fu4hpdLh8 jQ1xhMXVo3oZJ6vz9Ru5sJXJG+C4Qw== =uOkq -----END PGP SIGNATURE----- --glxsbqjrgyhckia6--