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>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the pm tree
Date: Wed, 5 Jul 2017 11:19:50 +0100 [thread overview]
Message-ID: <20170705101950.rjgio6qms2o7zdfk@sirena.org.uk> (raw)
In-Reply-To: <s5hmv8jb8tz.wl-tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
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 :(
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2017-07-05 10:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 2:25 linux-next: manual merge of the sound-asoc tree with the pm tree Stephen Rothwell
2017-07-03 2:55 ` Stephen Rothwell
2017-07-03 14:10 ` Takashi Iwai
2017-07-04 16:00 ` Rob Herring
2017-07-04 16:09 ` Takashi Iwai
2017-07-04 16:55 ` Rob Herring
2017-07-04 17:44 ` Takashi Iwai
2017-07-04 20:13 ` Rafael J. Wysocki
2017-07-05 7:34 ` Takashi Iwai
2017-07-05 8:12 ` Takashi Iwai
2017-07-05 10:19 ` Mark Brown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170705101950.rjgio6qms2o7zdfk@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=robh@kernel$(echo .)org \
--cc=sakari.ailus@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox