Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1665888
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Mark Brown <broonie@kernel.org> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree |
| Date | Wed, 14 Jun 2017 16:40:02 +0200 |
| Message-ID | <tShCG-6mB-9@gated-at.bofh.it> (permalink) |
| References | <tS6Hg-7QQ-15@gated-at.bofh.it> <tSgZY-5S3-33@gated-at.bofh.it> |
| X-Original-To | Rob Herring <robherring2@gmail.com> |
| MIME-Version | 1.0 |
| Content-Type | multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="glxsbqjrgyhckia6" |
| Content-Disposition | inline |
| 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 |
| 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 | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 32 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Stephen Rothwell <sfr@canb.auug.org.au>, Sakari Ailus <sakari.ailus@linux.intel.com>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| X-Original-Date | Wed, 14 Jun 2017 15:30:55 +0100 |
| X-Original-Message-ID | <20170614143055.5v6j4i5au3t3fw7s@sirena.org.uk> |
| X-Original-References | <20170614125423.48266e23@canb.auug.org.au> <CAL_Jsq+h8Bx9Ks8K8f6G7JJcouqChUEX40T4xosBdk+1GJiQiQ@mail.gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1665888 |
Show key headers only | View raw
[Multipart message — attachments visible in raw view] - view raw
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?
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the devicetree tree with the sound-asoc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-14 05:00 +0200
Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree Rob Herring <robherring2@gmail.com> - 2017-06-14 16:00 +0200
Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree Mark Brown <broonie@kernel.org> - 2017-06-14 16:40 +0200
Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree Sakari Ailus <sakari.ailus@linux.intel.com> - 2017-06-14 23:00 +0200
csiph-web