All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: tiwai@suse.de
Cc: alsa-devel@alsa-project.org, clemens@ladisch.de
Subject: Re: [PATCH 0/4] ALSA: firewire-lib: unify handlers for outgoing packet
Date: Fri, 24 May 2019 15:48:06 +0900	[thread overview]
Message-ID: <20190524064805.GB25133@workstation> (raw)
In-Reply-To: <20190523151440.5127-1-o-takashi@sakamocchi.jp>

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][alsa-devel] [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

Thanks


Takashi Sakamoto

  parent reply	other threads:[~2019-05-24  6:48 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23 15:14 [PATCH 0/4] ALSA: firewire-lib: unify handlers for outgoing packet Takashi Sakamoto
2019-05-23 15:14 ` [PATCH 1/4] ALSA: firewire-lib: split helper function to generate CIP header Takashi Sakamoto
2019-05-23 15:14 ` [PATCH 2/4] ALSA: firewire-lib: unify packet handler for IT context Takashi Sakamoto
2019-05-23 15:14 ` [PATCH 3/4] ALSA: firewire-lib: code refactoring to queueing packets Takashi Sakamoto
2019-05-23 15:14 ` [PATCH 4/4] ALSA: firewire-lib: use 8 byte packet header for IT context to separate CIP header from CIP payload Takashi Sakamoto
2019-05-24  6:48 ` Takashi Sakamoto [this message]
2019-05-24  7:06   ` [PATCH 0/4] ALSA: firewire-lib: unify handlers for outgoing packet Takashi Iwai
2019-05-24  9:07     ` Takashi Sakamoto

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=20190524064805.GB25133@workstation \
    --to=o-takashi@sakamocchi.jp \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.