Re: linux-next: manual merge of the driver-core.current tree with Linus tree

2013-01-04 Thread Greg KH
On Wed, Jan 02, 2013 at 10:37:26AM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core.current tree got a conflict > in drivers/i2c/busses/i2c-au1550.c between commit 0b255e927d47 ("i2c: > remove __dev* attributes from subsystem") from Linus' tree and commit >

linux-next: manual merge of the driver-core.current tree with Linus tree

2013-01-01 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core.current tree got a conflict in drivers/i2c/busses/i2c-au1550.c between commit 0b255e927d47 ("i2c: remove __dev* attributes from subsystem") from Linus' tree and commit eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the driver-core.

Re: linux-next: manual merge of the driver-core.current tree with Linus' tree

2012-12-23 Thread Greg KH
On Mon, Dec 24, 2012 at 09:56:14AM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 24 Dec 2012 09:52:00 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the driver-core.current tree got conflicts > > in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove >

Re: linux-next: manual merge of the driver-core.current tree with Linus' tree

2012-12-23 Thread Stephen Rothwell
Hi Greg, On Mon, 24 Dec 2012 09:52:00 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the driver-core.current tree got conflicts > in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove > __dev* attributes from subsystem") from Linus' tree and commit > eeb30d064414 ("

linux-next: manual merge of the driver-core.current tree with Linus' tree

2012-12-23 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core.current tree got conflicts in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove __dev* attributes from subsystem") from Linus' tree and commit eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the driver-core.current t