From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH 0/3] ALSA: hda: bus cleanup Date: Thu, 08 Aug 2019 16:45:09 +0200 Message-ID: References: <20190808095715.29713-1-tiwai@suse.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 104C5F803F3 for ; Thu, 8 Aug 2019 16:45:10 +0200 (CEST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org, Mark Brown , Jie Yang , Cezary Rojewski , Liam Girdwood , Thierry Reding List-Id: alsa-devel@alsa-project.org 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