linux-kernel - linux-next: manual merge of the genesis 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]

Date:	Thu, 5 Aug 2010 10:53:27 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Mundt <lethal@...ux-sh.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
	Kulikov Vasiliy <segooon@...il.com>
Subject: linux-next: manual merge of the genesis tree with Linus' tree

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
drivers/net/irda/sh_irda.c between commit
752ef8b541da2606c5668dcc176e7b16dd68b945 ("drivers: irda: fix sign bug")
from Linus' tree and commit 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
("net/irda/sh_irda: Modify clk_get lookups") from the genesis tree.

Just context changes.  I fixed it up (trivially) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/irda/sh_irda.c
index edd5666,9db7084..0000000
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c

Content of type "application/pgp-signature" skipped