* linux-next: strange update of the sound tree
@ 2017-06-05 14:17 Stephen Rothwell
2017-06-05 16:32 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2017-06-05 14:17 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Takashi,
I don't think you have the result in the sound tree
(git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
branch for-next). Yesterday it was a fairly linear tree with head
commit 7421a1671abe ("ALSA: pcm: include pcm_local.h and remove some
extraneous tabs") based on commit f83914fdfcc3 ("ALSA: usb-audio: fix
Amanero Combo384 quirk on big-endian hosts"). Now it is a tree with
687 commits (realative to Linus' tree) with 651 merge commits in it. :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: strange update of the sound tree
2017-06-05 14:17 linux-next: strange update of the sound tree Stephen Rothwell
@ 2017-06-05 16:32 ` Takashi Iwai
2017-06-05 21:41 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2017-06-05 16:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
On Mon, 05 Jun 2017 16:17:23 +0200,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> I don't think you have the result in the sound tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
> branch for-next). Yesterday it was a fairly linear tree with head
> commit 7421a1671abe ("ALSA: pcm: include pcm_local.h and remove some
> extraneous tabs") based on commit f83914fdfcc3 ("ALSA: usb-audio: fix
> Amanero Combo384 quirk on big-endian hosts"). Now it is a tree with
> 687 commits (realative to Linus' tree) with 651 merge commits in it. :-(
Doh, I pushed out a wrong branch (master) to for-next, as I had to
work on another machine at home today due to a holiday. Now the
correct branch was pushed.
Sorry for inconvenience, and thanks for catching it.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-05 21:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-05 14:17 linux-next: strange update of the sound tree Stephen Rothwell
2017-06-05 16:32 ` Takashi Iwai
2017-06-05 21:41 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox