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  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:	Wed, 2 Jan 2013 10:54:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the s390 tree with the  tree

Hi all,

Today's linux-next merge of the s390 tree got a conflict in
arch/s390/kernel/smp.c between commit c8925a6e95b2 ("ARCH: drivers remove
__dev* attributes") from the driver-core.current tree and commit
5059e4342f93 ("s390/smp: fix section mismatch for smp_add_present_cpu()")
from the s390 tree.

I fixed it up (I used the s390 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

Powered by blists - more mailing lists