linux-kernel - linux-next: manual merge of the arm-soc tree with the char-misc 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 17 Sep 2012 19:29:06 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the arm-soc tree with the char-misc
 tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/w1/masters/omap_hdq.c between commit 19afea50f12b ("w1: omap-hdq:
convert to devm_* functions") from the char-misc tree and commits
aefaf7be498b ("W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h")
and 73f2989d37a3 ("w1: omap-hdq: drop ARCH dependency") from the arm-soc
tree.

The former patches removed some of the code fixed up by the latter and
the same include line, so I did that 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