On Fri, May 24, 2019 at 09:06:55AM +0200, Takashi Iwai wrote:
> On Fri, 24 May 2019 08:48:06 +0200,
> Takashi Sakamoto wrote:
> >
> > Iwai-san,
> >
> > I cannot regenerate the conflict you mentioned[1] in my local:
> >
> > On Fri, May 24, 2019 at 12:14:36AM +0900, Takashi Sakamoto wrote:
> > > Takashi Sakamoto (4):
> > > ALSA: firewire-lib: split helper function to generate CIP header
> > > ALSA: firewire-lib: unify packet handler for IT context
> > > ALSA: firewire-lib: code refactoring to queueing packets
> > > ALSA: firewire-lib: use 8 byte packet header for IT context to
> > > separate CIP header from CIP payload
> > >
> > > sound/firewire/amdtp-stream.c | 150 ++++++++++++++++------------------
> > > sound/firewire/amdtp-stream.h | 3 -
> > > 2 files changed, 69 insertions(+), 84 deletions(-)
> >
> > I can successfully applied these patches onto either e4e07c6cdca8 ('ALSA:
> > hdspm: Fix single speed ADAT capture and playback with RME HDSPe AIO')[2] or
> > 947b437e1263 ('ALSA: firewire-lib: unify packet handler for IR context')[3]
> > in fetched your tree.
> >
> > Would I request you to try again?
> >
> > [1] [PATCH 0/6] ALSA: firewire-lib: unify handlers for incoming packet
> > https://mailman.alsa-project.org/pipermail/alsa-devel/2019-May/149742.html
> > [2] https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?h=for-next&id=e4e07c6cdca8a837ab40363fc8002cf62965a628
> > [3] https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?h=for-next&id=947b437e1263c81bb5d30a84f1a4a35dbb9f6b78
>
> OK, the patches seem applicable cleanly.
> I must have applied the wrong thread by some reason (maybe the
> subject lines are too confusing ;)
>
> Sorry for the noise.
No worries, but I should have avoided confusing patch title...
Just now I posted the last part of my refactoring for this packet
streaming engine. I'm happy if you apply them as well.
Thanks
Takashi Sakamoto
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
