linux-kernel - Re: linux-next: manual merge of the driver-core tree with the s390 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120104230757.GE24583@kroah.com>
Date:	Wed, 4 Jan 2012 15:07:57 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kay Sievers <kay.sievers@...y.org>,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the s390
 tree

On Wed, Dec 28, 2011 at 05:26:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/s390/kernel/smp.c between commit 83a24e329084 ("[S390] topology: get
> rid of ifdefs") from the s390 tree and commit 8a25a2fd126c ("cpu: convert
> 'cpu' and 'machinecheck' sysdev_class to a regular subsystem") from the
> driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> I also applied the following merge fix patch (which may not be correct or
> enough) for the bits moved into topology.c:

Looks good, thanks for doing this.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/