Hi Jean,

On Mon, 19 May 2008 09:37:06 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> On Mon, 19 May 2008 13:02:35 +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the i2c tree got a trivial conflict in
> > drivers/i2c/busses/i2c-nforce2.c because "i2c-nforce2: Disable the second
> > SMBus channel on the DFI Lanparty NF4 Expert" appeasr in both the i2c
> > tree and Linus' tree.  I assume that this will go away tomorrow when the
> > i2c tree gets resynced.
> 
> Correct. There are more than just this one patch in this case, BTW. I
> will resync the i2c tree in the next hour and then everything should
> apply again without conflicts. 

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/