Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1681073
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the sound-asoc tree with the pm tree |
| Date | 2017-07-04 18:10 +0200 |
| Message-ID | <tZyyJ-2dg-1@gated-at.bofh.it> (permalink) |
| References | <tVmw9-4E2-1@gated-at.bofh.it> <tYZKG-3fo-5@gated-at.bofh.it> <tZamM-2Dc-61@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Mon, Jul 3, 2017 at 9:10 AM, Takashi Iwai <tiwai@suse.de> wrote: > On Mon, 03 Jul 2017 04:55:24 +0200, > Stephen Rothwell wrote: >> >> Hi all, >> >> [cc-ing the sound tree maintainer] > > Thanks. > >> With the merge window opening, just a reminder that this conflict >> still exists. > > Rob, do you have an immutable branch to drag the affecting commit so > that I can merge & resolve in my side? Yes, use this branch: git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/property-move Rob
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Takashi Iwai <tiwai@suse.de> - 2017-07-03 16:20 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Rob Herring <robh@kernel.org> - 2017-07-04 18:10 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Takashi Iwai <tiwai@suse.de> - 2017-07-04 18:10 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Rob Herring <robh@kernel.org> - 2017-07-04 19:00 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Takashi Iwai <tiwai@suse.de> - 2017-07-04 19:50 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-04 22:30 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Takashi Iwai <tiwai@suse.de> - 2017-07-05 09:40 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Takashi Iwai <tiwai@suse.de> - 2017-07-05 10:20 +0200
Re: linux-next: manual merge of the sound-asoc tree with the pm tree Mark Brown <broonie@kernel.org> - 2017-07-05 12:30 +0200
csiph-web