From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Boaz Harrosh <bharrosh@panasas.com>, Tejun Heo <tj@kernel.org>,
James Smart <James.Smart@Emulex.Com>,
linux-scsi <linux-scsi@vger.kernel.org>,
FUJITA Tomonori <tomof@acm.org>,
Linux Kernel <linux-kernel@vger.kernel.org>,
Jens Axboe <Jens.Axboe@oracle.com>
Subject: Re: [PATCH version 2] [SQUASHME] "FC Pass Thru support" fixed for block/for-2.6.31 tree
Date: Wed, 20 May 2009 14:47:45 +0000 [thread overview]
Message-ID: <1242830865.2881.13.camel@localhost.localdomain> (raw)
In-Reply-To: <20090521004251.9160e228.sfr@canb.auug.org.au>
On Thu, 2009-05-21 at 00:42 +1000, Stephen Rothwell wrote:
> Hi James,
>
> On Wed, 20 May 2009 14:37:20 +0000 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> >
> > Unfortuantely, I still need the block tree for-next to be rebased up to
> > the current linus head because of a couple of conflicts:
> >
> > CONFLICT (content): Merge conflict in drivers/block/hd.c
> > CONFLICT (content): Merge conflict in drivers/block/mg_disk.c
>
> As discussed elsewhere, a merge of Linus' tree into the block tree will
> fix this.
Yes, I know, I was just adding urgency because scsi-misc has the two
conflicting commits in it, so it can't be merged into block for-next.
> > So they obviously moved into linus head but wasn't taken out of block
> > for-next.
>
> Indeed.
OK, so I think your pulling of my posmerge tree can cope with the fact
that I did the necessary rebasing in block for-next before I made it the
base of my combined tree .... think of this as a nice test.
Just building now ... if it works, I'll push to SCSI post merge and all
our problems should go away.
James
next prev parent reply other threads:[~2009-05-20 14:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-19 9:18 [PATCH] [SQUASHME] "FC Pass Thru support" fixed for block/for-2.6.31 tree Boaz Harrosh
2009-05-19 10:05 ` Tejun Heo
2009-05-19 10:14 ` Boaz Harrosh
2009-05-19 12:54 ` [PATCH version 2] " Boaz Harrosh
2009-05-20 1:16 ` Stephen Rothwell
2009-05-20 8:11 ` Boaz Harrosh
2009-05-20 12:54 ` James Smart
2009-05-20 14:37 ` James Bottomley
2009-05-20 14:42 ` Stephen Rothwell
2009-05-20 14:47 ` James Bottomley [this message]
2009-05-20 16:20 ` James Bottomley
2009-05-20 16:39 ` Boaz Harrosh
2009-05-20 16:40 ` Boaz Harrosh
2009-05-20 16:43 ` James Bottomley
2009-05-20 16:59 ` Boaz Harrosh
2009-05-20 17:03 ` Boaz Harrosh
2009-05-20 17:11 ` James Bottomley
2009-05-20 14:45 ` Stephen Rothwell
2009-05-20 19:10 ` Jens Axboe
2009-05-20 4:16 ` 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=1242830865.2881.13.camel@localhost.localdomain \
--to=james.bottomley@hansenpartnership.com \
--cc=James.Smart@Emulex.Com \
--cc=Jens.Axboe@oracle.com \
--cc=bharrosh@panasas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=tomof@acm.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