From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Boaz Harrosh <bharrosh@panasas.com>,
linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: [PATCH 1/8] firewire: ieee1394: Move away from SG_ALL
Date: Sat, 19 Jan 2008 09:01:45 -0600 [thread overview]
Message-ID: <1200754905.3136.4.camel@localhost.localdomain> (raw)
In-Reply-To: <4791ADC9.7090207@s5r6.in-berlin.de>
On Sat, 2008-01-19 at 08:59 +0100, Stefan Richter wrote:
> Stefan Richter wrote:
> > My guess is that there won't be conflicts of this with linux1394-2.6.git
> > anytime soon, so taking it into any other tree should be fine.
>
> Wrong, there should already be a (trivial) conflict due to a patch from
> December. Another (trivially) conflicting patch was sent to
> linux1394-devel a few hours ago. Both patches will land in Linus' tree
> early during the next merge window. So either refresh the patch when
> it's time, or give it to me. (Whatever, try not to add to akpm's pain.)
Actually, I'm already tracking potential conflicts. The
linux1394-2.6.git is part of the merge candidate tree I'm building
nightly. These patches will go through the (now slightly misnamed)
scsi-bidi-2.6.git tree. That one's built on top of all the currently
conflicting trees, and is scheduled to be the last thing merged in the
merge window (or at least to wait until the others its built on have
gone in).
James
next prev parent reply other threads:[~2008-01-19 15:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-17 16:37 [patch 0/8] Change SG_ALL to mean "any size" Boaz Harrosh
2008-01-17 16:41 ` [PATCH 1/8] firewire: ieee1394: Move away from SG_ALL Boaz Harrosh
2008-01-17 17:51 ` Stefan Richter
2008-01-19 7:59 ` Stefan Richter
2008-01-19 15:01 ` James Bottomley [this message]
2008-01-19 15:16 ` Stefan Richter
2008-01-17 16:44 ` [PATCH 2/8] scsi-drivers Don't use SG_ALL as allocation size Boaz Harrosh
2008-01-17 17:47 ` Andrew Vasquez
2008-01-17 18:11 ` Boaz Harrosh
2008-01-17 18:30 ` Andrew Vasquez
2008-01-17 18:57 ` [PATCH 2/8 ver2] " Boaz Harrosh
2008-01-17 16:46 ` [PATCH 3/8] NCR5380: Not sg-chain ready Boaz Harrosh
2008-01-17 16:48 ` [PATCH 4/8] wd33c93: " Boaz Harrosh
2008-01-17 16:49 ` [PATCH 5/8] arm/scsi: " Boaz Harrosh
2008-01-17 16:51 ` scsi: Drivers not ready for sg-chaining Boaz Harrosh
2008-02-10 15:42 ` James Bottomley
2008-02-10 16:08 ` Boaz Harrosh
2008-02-10 16:16 ` James Bottomley
2008-02-10 16:36 ` Boaz Harrosh
2008-02-10 16:53 ` James Bottomley
2008-01-17 16:53 ` [PATCH 7/8] a100u2w: advansys: initio: Wrong use of SG_ALL Boaz Harrosh
2008-01-17 16:55 ` [PATCH 8/8] Change SG_ALL to mean "any size" Boaz Harrosh
2008-01-17 17:53 ` [patch 0/8] " Stefan Richter
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=1200754905.3136.4.camel@localhost.localdomain \
--to=james.bottomley@hansenpartnership.com \
--cc=bharrosh@panasas.com \
--cc=linux-scsi@vger.kernel.org \
--cc=stefanr@s5r6.in-berlin.de \
/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;
as well as URLs for NNTP newsgroup(s).