linux-kernel - linux-next: manual merge of the sound-asoc tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190902140419.110a2c03@canb.auug.org.au>
Date:   Mon, 2 Sep 2019 14:04:19 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+samsung@...nel.org>,
        Maxime Ripard <maxime.ripard@...tlin.com>
Subject: linux-next: manual merge of the sound-asoc tree with the jc_docs
 tree

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt

between commit:

  aa95b4a960ab ("docs: fix a couple of new broken references")

from the jc_docs tree and commit:

  8a99f76ac1a5 ("ASoC: dt-bindings: Convert Allwinner A33 codec to a schema")

from the sound-asoc tree.

I fixed it up (the latter removed the file, so I did that) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped