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  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]
Date:	Fri, 25 Jul 2014 16:23:53 +1000
From:	Stephen Rothwell <>
To:	Greg KH <>, Simon Horman <>
	Pawel Moll <>,
	Laurent Pinchart <>
Subject: linux-next: manual merge of the driver-core tree with the renesas

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-shmobile/setup-r7s72100.c between commit 9394af431455
("ARM: shmobile: genmai-reference: Enable MTU2 in device tree") from
the renesas tree and commit d2168146c222 ("platform: Remove most
references to platform_bus device") from the driver-core tree.

I fixed it up (the former removed the code that the latter modified)
and can carry the fix as necessary (no action is required).

Stephen Rothwell          

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

Powered by blists - more mailing lists