public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Boaz Harrosh <bharrosh@panasas.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	James Bottomley <James.Bottomley@HansenPartnership.com>
Subject: Re: linux-next: manual merge of the osd tree with the scsi tree
Date: Sun, 29 Nov 2009 11:10:26 +0200	[thread overview]
Message-ID: <4B123A82.10104@panasas.com> (raw)
In-Reply-To: <20091127143229.108298c6.sfr@canb.auug.org.au>

On 11/27/2009 05:32 AM, Stephen Rothwell wrote:
> Hi Boaz,
> 
> Today's linux-next merge of the osd tree got a conflict in
> drivers/scsi/osd/osd_uld.c between commit
> f89b9ee4a722721ed205b8c29555ac75fbe8c2cc ("[SCSI] osduld: Use
> device->release instead of internal kref") from the scsi tree and commit
> 9b579fe8588b861dcf0c9b620757729643db4557 ("osduld: Use device->release
> instead of internal kref") from the osd tree.
> 
> These are slightly different versions of the same patch ...
> 
> And commit 01e4c32c668251e74eb179ee1207c075466c4ef8 ("osduld: No need to
> use dev_set_drvdata on embedded devices") from the osd also contributes
> to the conflict.
> 

James has squashed these two patches together. Which do belong together
I should say. In my tree they are separate. I will change my tree to
match James's.

Thanks James, I prefer it much better this way.

> I fixed it up (the obvious way) and can carry the fix for a while.

Thanks
Boaz

  reply	other threads:[~2009-11-29  9:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-27  3:32 linux-next: manual merge of the osd tree with the scsi tree Stephen Rothwell
2009-11-29  9:10 ` Boaz Harrosh [this message]
2009-11-29 13:07   ` Boaz Harrosh
2009-11-29 13:46     ` James Bottomley
2009-11-29 14:23       ` Boaz Harrosh
2009-11-29 15:23         ` James Bottomley
2009-11-29 21:44           ` 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:
  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=4B123A82.10104@panasas.com \
    --to=bharrosh@panasas.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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