Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1665888

Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree

Show all headers | 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

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