From: Roland Dreier <rdreier@cisco.com>
To: Steve Wise <swise@opengridcomputing.com>
Cc: Netdev@vger.kernel.org, Jeff Garzik <jeff@garzik.org>,
OpenFabrics General <general@lists.openfabrics.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Divy Le Ray <divy@chelsio.com>
Subject: [ofa-general] Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.
Date: Thu, 12 Apr 2007 09:07:20 -0700 [thread overview]
Message-ID: <ada3b35ink7.fsf@cisco.com> (raw)
In-Reply-To: <1176392566.9396.11.camel@stevo-desktop> (Steve Wise's message of "Thu, 12 Apr 2007 10:42:46 -0500")
> The patch is the 3rd of 3:
>
> http://marc.info/?l=linux-kernel&m=117617444622279&w=2
>
> Jeff applied it into his upstream tree here:
>
> http://marc.info/?l=linux-netdev&m=117630664627997&w=2
OK, so it's not in Linus's tree yet. Jeff, how do you want to handle
this? (That last patch breaks drivers/infiniband/hw/cxgb3, and Steve
posted a fix to handle it)
The cleanest thing would be for you to roll up Steve's fix into the
patch you merged, so that Linus's tree is never in the state where it
has half the change merged. But I don't know if that fits your
workflow.
Thanks...
next prev parent reply other threads:[~2007-04-12 16:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-12 12:56 [ofa-general] [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler Steve Wise
2007-04-12 14:44 ` [ofa-general] " Divy Le Ray
2007-04-12 15:23 ` Roland Dreier
2007-04-12 15:42 ` Steve Wise
2007-04-12 16:07 ` Roland Dreier [this message]
2007-04-12 17:30 ` [ofa-general] " Roland Dreier
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=ada3b35ink7.fsf@cisco.com \
--to=rdreier@cisco.com \
--cc=Netdev@vger.kernel.org \
--cc=divy@chelsio.com \
--cc=general@lists.openfabrics.org \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=swise@opengridcomputing.com \
/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).