[alsa-devel] [PATCH 0/3] ALSA: hda: bus cleanup

Takashi Iwai tiwai at suse.de
Thu Aug 8 16:45:09 CEST 2019


On Thu, 08 Aug 2019 16:23:40 +0200,
Pierre-Louis Bossart wrote:
> 
> One request from me since I am lazy: could we somehow merge branches
> between you / Mark since at the moment we have two sets of conflicts
> (NHLT and this one). We test all the upstream changes on hardware as
> soon as we can, and manual conflict resolution makes it slower/more
> error prone.

I don't mind who actually merges.  I'm going to push out my topic
branch once after gathering enough Ack's.  Then Mark can pull it into
his tree (as well as topic/hda-dmic branch).

Or if Mark can give me the branch, I can pull into my for-next
branch, too.  Basically my for-next branch is persistent and not
rebased, so you can work on it once when set.

Mark, just let me know your preference.


thanks,

Takashi


More information about the Alsa-devel mailing list