archive mirror
 help / color / mirror / Atom feed
From: Jean Delvare <>
To: Stephen Rothwell <>
Subject: Re: linux-next: i2c merge conflict
Date: Mon, 19 May 2008 09:37:06 +0200	[thread overview]
Message-ID: <20080519093706.50ef0c63@hyperion.delvare> (raw)
In-Reply-To: <>

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

  reply	other threads:[~2008-05-19  7:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-19  3:02 linux-next: i2c merge conflict Stephen Rothwell
2008-05-19  7:37 ` Jean Delvare [this message]
2008-05-19  7:51   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080519093706.50ef0c63@hyperion.delvare \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).