linux-kernel - linux-next: manual merge of the sound 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]

Date:   Mon, 14 Nov 2016 11:18:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Takashi Iwai <tiwai@...e.de>, Jonathan Corbet <corbet@....net>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Mauro Carvalho Chehab <mchehab@...pensource.com>
Subject: linux-next: manual merge of the sound tree with the jc_docs tree

Hi Takashi,

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

  Documentation/sound/alsa/alsa-parameters.txt

between commit:

  8c27ceff3604 ("docs: fix locations of several documents that got moved")

from the jc_docs tree and commit:

  3a5182c04a02 ("ALSA: doc: Remove alsa-parameters.txt")

from the sound tree.

I fixed it up (I just removed the file) 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