lkml.org 
[lkml]   [2012]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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]
\
 
 \ /
  Last update: 2012-12-24 00:21    [W:0.037 / U:2.724 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site