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
(Eliminate
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 context
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:
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)
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_
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
Hi Greg,
On Mon, 15 Jun 2009 23:18:49 -0700 Greg KH g...@kroah.com 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.
