linux-kernel - linux-next: manual merge of the thermal-soc tree with the thermal 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: <20160704125522.011806af@canb.auug.org.au>
Date:	Mon, 4 Jul 2016 12:55:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Eduardo Valentin <edubezval@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Zhang Rui <rui.zhang@...el.com>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: linux-next: manual merge of the thermal-soc tree with the thermal
 tree

Hi Eduardo,

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

  drivers/thermal/thermal_core.c
  drivers/thermal/thermal_helpers.c
  drivers/thermal/thermal_sysfs.c

between commits from the thermal tree and the same (or similar) patches
from the thermal-soc tree.

It looks like a the patches have been slightly changed when applied to the
thermal tree and then more commist have been applied to the thermal-soc
tree, so there are a few conflicts generated.   Please fix up these trees.

I fixed it up (I used what seemed the appropriate versions - which may
or may not be the right ones) and can carry the fixes 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