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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham 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 7B456C43381 for ; Mon, 4 Mar 2019 20:59:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37DB7206B6 for ; Mon, 4 Mar 2019 20:59:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="I5uEbV/5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726414AbfCDU7S (ORCPT ); Mon, 4 Mar 2019 15:59:18 -0500 Received: from ozlabs.org ([203.11.71.1]:44521 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726061AbfCDU7R (ORCPT ); Mon, 4 Mar 2019 15:59:17 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 44CspB0Bddz9s47; Tue, 5 Mar 2019 07:59:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1551733155; bh=+EVMM1ptnigBSPqiEfhVfNajGldPofsWN/Lfz4vPefc=; h=Date:From:To:Cc:Subject:From; b=I5uEbV/5VVQvcnKXGVAzwgmlYqatHv+DuZGEfetuN1ZtKQqqJrrATGSAaagZPJjYW NF/yADlHhZadx/kkjomOlxnHU0ZkbFmLrn7LiWbwb7QhkHQVt9GBUWoy5YtMWRI2pE 51WIT4mMH6qtupfxTheqUF8ALJoMwwzlx/Ce6r9taQ27sjIRssGY35ho6u6HkjCP0U Q7mIuz3ssVDMkQceZBSle7v42+ciECivlNQmtlOY64W5gv/JiU0QFqjuloRebx2e9U 3Xr5Kue/nuQMSbOac7KTvm4vmf42O6HqP4YX6B2nFqHJjrlFthEeUlrRX/mUdxQVFX scRfLsBslW9Rw== Date: Tue, 5 Mar 2019 07:59:11 +1100 From: Stephen Rothwell To: Mark Brown , Liam Girdwood , Takashi Iwai Cc: Linux Next Mailing List , Linux Kernel Mailing List , Guennadi Liakhovetski , Philipp Puschmann Subject: linux-next: manual merge of the sound-asoc-fixes tree with the sound-current tree Message-ID: <20190305075911.4646469f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/x.X1z5=WVdk.2U_Dqj3ih82"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/x.X1z5=WVdk.2U_Dqj3ih82 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the sound-asoc-fixes tree got a conflict in: sound/soc/codecs/tlv320aic3x.c between commit: 0bb423f2eaaf ("ASoC: regulator notifier registration should be managed") from the sound-current tree and commit: 82ad759143ed ("ASoC: tlv320aic3x: fix reset gpio reference counting") from the sound-asoc-fixes tree. I fixed it up (I just used the former version which removed some code modified by the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/x.X1z5=WVdk.2U_Dqj3ih82 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlx9kZ8ACgkQAVBC80lX 0Gx/cgf/epAT/agx2etvDB6rR4dUrgYKxIqCmoSdfY+6uw4wv3v0Z5FJaJOiT//S PAMUHoyrg1R4hPbsVdfkV7a7yRzGHEchyp4eF7IwiT+bT4Yz0toU1qYJIbmImBVb RjkSvXmL/rlt+y0DlPnAF8Wua5C0qd610u2nWQ5vF2SfwojS98tNVk438SSQapNT 2bm+67G+EJqd4wqB29w+8mQf97imr2te7QfKYCLG9o4Qp7BMQ+/z4PrO6EzvKR9u GJmRjq4sjo6Kbjn5L2EKjWOvw8qnzOILvmgpfxVpgmesV8Gme+avxCuoT5lFgcPd IOKim1+SP+tQJBwwv+MQWzRCyCji1Q== =rqbK -----END PGP SIGNATURE----- --Sig_/x.X1z5=WVdk.2U_Dqj3ih82--