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


Groups > linux.kernel > #1657622 > unrolled thread

linux-next: strange update of the sound tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2017-06-05 16:20 +0200
Last post2017-06-05 23:50 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel


Contents

  linux-next: strange update of the sound tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-05 16:20 +0200
    Re: linux-next: strange update of the sound tree Takashi Iwai <tiwai@suse.de> - 2017-06-05 18:40 +0200
      Re: linux-next: strange update of the sound tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-05 23:50 +0200

#1657622 — linux-next: strange update of the sound tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2017-06-05 16:20 +0200
Subjectlinux-next: strange update of the sound tree
Message-ID<tP11n-3Xu-7@gated-at.bofh.it>
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

[toc] | [next] | [standalone]


#1657836

FromTakashi Iwai <tiwai@suse.de>
Date2017-06-05 18:40 +0200
Message-ID<tP3cU-5hS-79@gated-at.bofh.it>
In reply to#1657622
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

[toc] | [prev] | [next] | [standalone]


#1658165

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2017-06-05 23:50 +0200
Message-ID<tP82R-8gQ-1@gated-at.bofh.it>
In reply to#1657836
Hi Takashi,

On Mon, 05 Jun 2017 18:32:54 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> 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.

Much better, thanks :-)

-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web