From: Roland Dreier <rdreier@cisco.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, general@lists.openfabrics.org
Subject: [ofa-general] Re: linux-next: manual merge of the infiniband tree
Date: Thu, 24 Jul 2008 20:50:05 -0700 [thread overview]
Message-ID: <adaabg6wrki.fsf@cisco.com> (raw)
In-Reply-To: <20080725134444.9e67772c.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 25 Jul 2008 13:44:44 +1000")
> Today's linux-next merge of the infiniband tree got a conflict in
> include/linux/mlx4/qp.h between commit
> 95d04f0735b4fc837bff9aedcc3f3efb20ddc3d1 ("IB/mlx4: Add support for
> memory management extensions and local DMA L_Key") from Linus' tree and
> commit 5fcbaab14db959eb6feecae57387cfff364f11b3 ("IB/mlx4: Add support
> for memory management extensions and local DMA L_Key") from the
> infiniband tree.
>
> Please don't submit patches to Linus that are different to those you have
> in linux-next.
Sorry, someone pointed out a bug in the patch just before I sent it to
Linus. I've updated my tree to Linus's, so this conflict should be gone
tomorrow.
Thanks,
Roland
next prev parent reply other threads:[~2008-07-25 3:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-25 3:44 linux-next: manual merge of the infiniband tree Stephen Rothwell
2008-07-25 3:50 ` Roland Dreier [this message]
2008-07-25 4:36 ` 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=adaabg6wrki.fsf@cisco.com \
--to=rdreier@cisco.com \
--cc=general@lists.openfabrics.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.