linux-kernel - linux-next: manual merge of the staging 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120925161355.06cfe875c78bc163b050ed8c@canb.auug.org.au>
Date:	Tue, 25 Sep 2012 16:13:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eduardo Valentin <eduardo.valentin@...com>,
	Durgadoss R <durgadoss.r@...el.com>,
	Zhang Rui <rui.zhang@...el.com>
Subject: linux-next: manual merge of the staging tree with the thermal tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/omap-thermal/omap-thermal-common.c between commit
82d3a76a88cd ("Thermal: Pass zone parameters as argument to
tzd_register") from the thermal tree and commit 765a1939a364 ("staging:
omap-thermal: fix polling period settings") from the staging tree.

I just used the thermal tree version and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped