From: James Bottomley <James.Bottomley@SteelEye.com>
To: Mark Haverkamp <markh@osdl.org>
Cc: linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: Latest update to scsi-misc-2.6
Date: Mon, 31 Oct 2005 11:32:28 -0600 [thread overview]
Message-ID: <1130779948.3293.35.camel@mulgrave> (raw)
In-Reply-To: <1130778840.24530.20.camel@markh1.pdx.osdl.net>
On Mon, 2005-10-31 at 09:13 -0800, Mark Haverkamp wrote:
> I updated my local scsi-misc-2.6 tree today and had merge conflicts
> somehow. The tree had not been previously locally modified and was up
> to date as of last week. I used the cg-update command to perform the
> update. After receiving the changes it got a merge conflict:
>
> Applying changes...
> Merging fe607aa94f5d25ee84f9a9a4fdf2cce3765e12e4 -> d078650986b117520f2b10cb72c04bc1904e3ba7
> to a25bbd9e2f6c6907672301fe934a8f9989e60330...
> ... Auto-merging drivers/scsi/scsi_scan.c
> merge: warning: conflicts during merge
My best guess is that your merge programme is confused. I've had to
merge the tree up several times to fix conflicts, but it's the same
tree. It looks like whatever tool you used to merge failed to recognise
this.
James
next prev parent reply other threads:[~2005-10-31 17:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-31 17:13 Latest update to scsi-misc-2.6 Mark Haverkamp
2005-10-31 17:32 ` James Bottomley [this message]
2005-10-31 17:36 ` Mark Haverkamp
2005-10-31 17:38 ` Christoph Hellwig
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1130779948.3293.35.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=linux-scsi@vger.kernel.org \
--cc=markh@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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