From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kay Sievers <kay.sievers@vrfy.org>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the s390 tree
Date: Wed, 4 Jan 2012 15:07:57 -0800 [thread overview]
Message-ID: <20120104230757.GE24583@kroah.com> (raw)
In-Reply-To: <20111228172611.b23752f58cc9cda66c194dc2@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-01-04 23:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 6:26 linux-next: manual merge of the driver-core tree with the s390 tree Stephen Rothwell
2012-01-04 23:07 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-21 1:34 Stephen Rothwell
2023-03-21 7:39 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120104230757.GE24583@kroah.com \
--to=greg@kroah.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox