From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 535C5C43381 for ; Mon, 25 Feb 2019 11:15:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 184092087C for ; Mon, 25 Feb 2019 11:15:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DJBmPhrP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 184092087C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jMyTSRmF3aULdMUI6uV/syCxjGbkBTRvW40d4UBOffU=; b=DJBmPhrPNipY11 B36Wwus1R+AHRMKwucsjpq9Q7g7UoX4kL6pB0/RQxoyxh6C4KEuUI6sVZW37hYZLfpc8oZOAioLEL lh6l0KBeGUZePpgI++FKLnME843i/PDDF+32iuRWY4D/jIJjZ6YnSmjahwxWEDqWHXyTaBjj4vlCF UrOlrg861Pg/iFAahgRqmudA4VtQEDNgBAIqcP8jJNkZ043xkquBXW5bkfAavfe88jvCBOqYTdewP rbCe/JFqdgzmYsdvQeFo0js0XVOulO+Kp32ZUDTLXYTJQ/au8KxvR1CvtWaPxxbC2rxU10bKubm/F j27tF53tWDbR3iEsLmDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gyEDv-0008DU-RL; Mon, 25 Feb 2019 11:15:03 +0000 Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gyEDr-0008BY-Aw for linux-arm-kernel@lists.infradead.org; Mon, 25 Feb 2019 11:15:00 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BC062AAA9; Mon, 25 Feb 2019 11:14:53 +0000 (UTC) Date: Mon, 25 Feb 2019 12:14:53 +0100 Message-ID: From: Takashi Iwai To: Arnd Bergmann Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree In-Reply-To: References: <20190225123615.49bce7cd@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190225_031459_521591_CBD0DD9A X-CRM114-Status: GOOD ( 18.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Sameer Pujar , Linux Kernel Mailing List , Liam Girdwood , Linux Next Mailing List , Mark Brown , Olof Johansson , Thierry Reding , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 25 Feb 2019 10:19:15 +0100, Arnd Bergmann wrote: > > On Mon, Feb 25, 2019 at 2:36 AM Stephen Rothwell wrote: > > > > Hi Takashi, > > > > Today's linux-next merge of the sound tree got conflicts in: > > > > arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts > > arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi > > > > between commits: > > > > 5eef17ee764d ("arm64: tegra: p2972: Sort nodes properly") > > be4f0dd347ad ("arm64: tegra: p2597: Sort nodes by unit-address") > > > > from the arm-soc tree and commit: > > > > 11ce4308307c ("arm64: tegra: custom name for hda sound card") > > > > from the sound tree. > > > > I fixed it up (see below - in tegra194-p2972-0000.dts. the line added > > just needed to be moved up a few lines) and can carry the fix as > > necessary. This is now fixed as far as linux-next is concerned, but any > > non trivial conflicts should be mentioned to your upstream maintainer > > when your tree is submitted for merging. You may also want to consider > > cooperating with the maintainer of the conflicting tree to minimise any > > particularly complex conflicts. > > The merge looks fine to me, but I wonder about that commit > in the alsa tree, why does the sound card need a board specific > name? > > I see this property being used in commit c0bde003a013 ("ALSA: > hda/tegra: sound card name from device tree"), which removes > a questionable use of the root compatible property, replacing > it with the new 'nvidia,model' property. We don't do this for any > other subsystem, so why does the sound subsystem export > information about the board as a string here? The sound subsystem exports merely some understandable name string for the given sound card object, and that was composed from the compatible string in the past, which turned out to be useless on some configs. But this kind of addition is an extremely bad manner, I'm fine to revert these (at best with a better alternative). This isn't about any functionality but rather some readable information that isn't a part of API. thanks, Takashi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel