lkml.org 
[lkml]   [2013]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-02 01:41    [W:0.031 / U:0.568 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site