All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>,
	Roel Kluin <roel.kluin@gmail.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	ppc-dev <linuxppc-dev@ozlabs.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree
Date: Mon, 15 Jun 2009 23:18:49 -0700	[thread overview]
Message-ID: <20090616061849.GA32109@kroah.com> (raw)
In-Reply-To: <20090616155317.d1f1217e.sfr@canb.auug.org.au>

On Tue, Jun 16, 2009 at 03:53:17PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/block/ps3disk.c between commits
> 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef ("block/ps3: remove driver_data
> direct access of struct device") and
> 03fa68c245cccbcb99035cbabaa13b408ba91ab5 ("ps3: shorten ps3_system_bus_
> [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata") from the powerpc
> tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a ("block/ps3:
> remove driver_data direct access of struct device") from the driver-core
> tree.
> 
> I fixed it up (I used the version from the powerpc tree).  Greg, I think
> the driver-core patch is no longer relevant.

I pushed out an update a number of hours ago (like 6+), so you should
have gotten it with this update.

When did you pull from my tree?  I also just sent a merge request to
Linus, so everything should be fixed up now.

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: Roel Kluin <roel.kluin@gmail.com>,
	linux-kernel@vger.kernel.org, ppc-dev <linuxppc-dev@ozlabs.org>,
	linux-next@vger.kernel.org,
	Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree
Date: Mon, 15 Jun 2009 23:18:49 -0700	[thread overview]
Message-ID: <20090616061849.GA32109@kroah.com> (raw)
In-Reply-To: <20090616155317.d1f1217e.sfr@canb.auug.org.au>

On Tue, Jun 16, 2009 at 03:53:17PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/block/ps3disk.c between commits
> 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef ("block/ps3: remove driver_data
> direct access of struct device") and
> 03fa68c245cccbcb99035cbabaa13b408ba91ab5 ("ps3: shorten ps3_system_bus_
> [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata") from the powerpc
> tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a ("block/ps3:
> remove driver_data direct access of struct device") from the driver-core
> tree.
> 
> I fixed it up (I used the version from the powerpc tree).  Greg, I think
> the driver-core patch is no longer relevant.

I pushed out an update a number of hours ago (like 6+), so you should
have gotten it with this update.

When did you pull from my tree?  I also just sent a merge request to
Linus, so everything should be fixed up now.

thanks,

greg k-h

  reply	other threads:[~2009-06-16  6:24 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-16  5:53 linux-next: manual merge of the driver-core tree with the powerpc tree Stephen Rothwell
2009-06-16  5:53 ` Stephen Rothwell
2009-06-16  5:53 ` Stephen Rothwell
2009-06-16  6:18 ` Greg KH [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2009-06-16  5:58 Stephen Rothwell
2009-06-16  5:58 ` Stephen Rothwell
2009-06-16  5:58 ` Stephen Rothwell
2011-12-28  5:51 Stephen Rothwell
2011-12-28  5:51 ` Stephen Rothwell
2011-12-28  5:51 ` Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2012-01-04 23:08   ` Greg KH
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

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=20090616061849.GA32109@kroah.com \
    --to=greg@kroah.com \
    --cc=Geert.Uytterhoeven@sonycom.com \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=roel.kluin@gmail.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 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.