linux-kernel - linux-next: manual merge of the thermal tree with Linus' tree

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: <20190920124628.GE3822@sirena.co.uk>
Date:   Fri, 20 Sep 2019 13:46:28 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Zhang Rui <rui.zhang@...el.com>,
        Mauro Carvalho Chehab <mchehab+samsung@...nel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the thermal tree with Linus' tree

Hi all,

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

  Documentation/driver-api/thermal/index.rst
  Documentation/driver-api/thermal/sysfs-api.rst
  Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst

between commit:

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

from Linus' tree and commit:

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

from the thermal tree.

I fixed it up 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.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)