Messages in this thread | | | Date | Mon, 24 Dec 2012 09:56:14 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the driver-core.current tree with Linus' tree |
| |
Hi Greg,
On Mon, 24 Dec 2012 09:52:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 ("Drivers: i2c: remove __dev* attributes") from the > driver-core.current tree. > > I fixed it up (taking a mixture of both commits) and can carry the fix as > necessary (no action is required).
BTW, Greg, the patch in your tree to drivers/i2c/busses/i2c-au1550.c is incorrect and would not build.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |