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>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org,
Deepthi Dharwar <deepthi@linux.vnet.ibm.com>,
Trinabh Gupta <g.trinabh@gmail.com>,
Arun R Bharadwaj <arun.r.bharadwaj@gmail.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree
Date: Wed, 4 Jan 2012 15:08:09 -0800 [thread overview]
Message-ID: <20120104230809.GF24583@kroah.com> (raw)
In-Reply-To: <20111228165102.fbb6433fd94d11240134327e@canb.auug.org.au>
On Wed, Dec 28, 2011 at 04:51:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 ("powerpc: Export
> PIR data through sysfs") from the powerpc tree and commits 8a25a2fd126c
> ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
> subsystem") and 707827f3387d ("powerpc/cpuidle: cpuidle driver for
> pSeries") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks.
greg k-h
WARNING: multiple messages have this Message-ID (diff)
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>,
Trinabh Gupta <g.trinabh@gmail.com>,
Kay Sievers <kay.sievers@vrfy.org>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org,
Arun R Bharadwaj <arun.r.bharadwaj@gmail.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree
Date: Wed, 4 Jan 2012 15:08:09 -0800 [thread overview]
Message-ID: <20120104230809.GF24583@kroah.com> (raw)
In-Reply-To: <20111228165102.fbb6433fd94d11240134327e@canb.auug.org.au>
On Wed, Dec 28, 2011 at 04:51:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 ("powerpc: Export
> PIR data through sysfs") from the powerpc tree and commits 8a25a2fd126c
> ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
> subsystem") and 707827f3387d ("powerpc/cpuidle: cpuidle driver for
> pSeries") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2012-01-04 23:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 5:51 linux-next: manual merge of the driver-core tree with the powerpc tree Stephen Rothwell
2011-12-28 5:51 ` Stephen Rothwell
2011-12-28 5:51 ` Stephen Rothwell
2012-01-04 23:08 ` Greg KH [this message]
2012-01-04 23:08 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2012-03-09 5:40 Stephen Rothwell
2012-03-09 5:40 ` Stephen Rothwell
2012-03-09 5:40 ` Stephen Rothwell
2012-03-09 15:18 ` Greg KH
2012-03-09 15:18 ` Greg KH
2009-06-16 5:58 Stephen Rothwell
2009-06-16 5:58 ` Stephen Rothwell
2009-06-16 5:58 ` Stephen Rothwell
2009-06-16 5:53 Stephen Rothwell
2009-06-16 5:53 ` Stephen Rothwell
2009-06-16 5:53 ` Stephen Rothwell
2009-06-16 6:18 ` Greg KH
2009-06-16 6:18 ` Greg KH
2009-06-16 6:42 ` Stephen Rothwell
2009-06-16 6:42 ` Stephen Rothwell
2009-06-16 6:42 ` Stephen Rothwell
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=20120104230809.GF24583@kroah.com \
--to=greg@kroah.com \
--cc=ananth@in.ibm.com \
--cc=arun.r.bharadwaj@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=deepthi@linux.vnet.ibm.com \
--cc=g.trinabh@gmail.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.