linux-kernel - linux-next: manual merge of the thermal 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: <20190823120454.654577c5@canb.auug.org.au>
Date:   Fri, 23 Aug 2019 12:04:54 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Zhang Rui <rui.zhang@...el.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>
Subject: linux-next: manual merge of the thermal tree with the jc_docs tree

Hi all,

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

  Documentation/driver-api/thermal/index.rst

between commit:

  eaf7b46083a7 ("docs: thermal: add it to the driver API")

from the jc_docs tree and commit:

  af3e0fe9c663 ("docs: thermal: add it to the driver API")

from the thermal tree.

I fixed it up (the former just has an SPDX tag at the top) 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