Re: linux-next: manual merge of the driver-core tree with the powerpc tree

2012-03-09 Thread Greg KH
On Fri, Mar 09, 2012 at 04:40:25PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove > legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8 > ("El

linux-next: manual merge of the driver-core tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8 ("Eliminate get_driver() and put_driver()") from the driver-core tree. Just conte

Re: linux-next: manual merge of the driver-core tree with the powerpc tree

2012-01-04 Thread Greg KH
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

linux-next: manual merge of the driver-core tree with the powerpc tree

2011-12-27 Thread Stephen Rothwell
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"

Re: linux-next: manual merge of the driver-core tree with the powerpc tree

2009-06-15 Thread Stephen Rothwell
Hi Greg, On Mon, 15 Jun 2009 23:18:49 -0700 Greg KH wrote: > > 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. OK, tha

Re: linux-next: manual merge of the driver-core tree with the powerpc tree

2009-06-15 Thread Greg KH
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"

linux-next: manual merge of the driver-core tree with the powerpc tree

2009-06-15 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/block/ps3vram.c between commits 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef ("block/ps3: remove driver_data direct access of struct device") and 03fa68c245cccbcb99035cbabaa13b408ba91ab5 ("ps3: shorten ps3_system_bus_

linux-next: manual merge of the driver-core tree with the powerpc tree

2009-06-15 Thread Stephen Rothwell
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_

Re: linux-next: manual merge of the driver-core tree

2009-01-04 Thread Stephen Rothwell
Hi Greg, On Sun, 4 Jan 2009 20:36:46 -0800 Greg KH wrote: > > Thanks for letting me know, I'll drop it from my tree when I sync up > with Linus's tree tomorrow. Thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpA9BIcZ3JSe.pgp De

Re: linux-next: manual merge of the driver-core tree

2009-01-04 Thread Greg KH
On Mon, Jan 05, 2009 at 10:28:00AM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Wed, 3 Dec 2008 20:21:54 -0800 Greg KH wrote: > > > > On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the driver-core tree got a conflict in > > > arch/po

Re: linux-next: manual merge of the driver-core tree

2009-01-04 Thread Stephen Rothwell
Hi Greg, On Wed, 3 Dec 2008 20:21:54 -0800 Greg KH wrote: > > On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the driver-core tree got a conflict in > > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit > > 24a99596f7465274a8e65ddd29a7

Re: linux-next: manual merge of the driver-core tree

2008-12-04 Thread Greg KH
On Thu, Dec 04, 2008 at 09:42:14PM +1100, Paul Mackerras wrote: > Greg KH writes: > > > Yes, Paul, please apply the patch, and let me know. It will make things > > much easier in the end for everyone involved. > > Hmmm, I don't have it in my inbox, all I can find is an email from Kay > saying it

Re: linux-next: manual merge of the driver-core tree

2008-12-04 Thread Paul Mackerras
Greg KH writes: > Yes, Paul, please apply the patch, and let me know. It will make things > much easier in the end for everyone involved. Hmmm, I don't have it in my inbox, all I can find is an email from Kay saying it had a problem. Care to forward it to me? Paul.

Re: linux-next: manual merge of the driver-core tree

2008-12-03 Thread Greg KH
On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit > 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile > warnings in mpc85x

linux-next: manual merge of the driver-core tree

2008-12-03 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile warnings in mpc85xx_mds.c") from the galak tree and commit f58f23751464d095f9942304bc5f6072b79a2