* linux-next: i2c merge conflict
@ 2008-05-19 3:02 Stephen Rothwell
2008-05-19 7:37 ` Jean Delvare
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-19 3:02 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
Hi Jean,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: i2c merge conflict
2008-05-19 3:02 linux-next: i2c merge conflict Stephen Rothwell
@ 2008-05-19 7:37 ` Jean Delvare
2008-05-19 7:51 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2008-05-19 7:37 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen,
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.
--
Jean Delvare
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: i2c merge conflict
2008-05-19 7:37 ` Jean Delvare
@ 2008-05-19 7:51 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-19 7:51 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-19 7:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-19 3:02 linux-next: i2c merge conflict Stephen Rothwell
2008-05-19 7:37 ` Jean Delvare
2008-05-19 7:51 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).