linux-kernel - linux-next: manual merge of 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20170626111331.5443587b@canb.auug.org.au>
Date:   Mon, 26 Jun 2017 11:13:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kamil Rytarowski <n54@....com>
Subject: linux-next: manual merge of the jc_docs tree with the kbuild tree

Hi Jonathan,

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

  scripts/kernel-doc-xml-ref

between commit:

  cb77f0d623ff ("scripts: Switch to more portable Perl shebang")

from the kbuild tree and commit:

  52b3f239bb69 ("Docs: clean up some DocBook loose ends")

from the jc_docs 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