* linux-next: manual merge of the infiniband tree
@ 2008-07-25 3:44 Stephen Rothwell
2008-07-25 3:50 ` [ofa-general] " Roland Dreier
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-25 3:44 UTC (permalink / raw)
To: Roland Dreier, general; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 653 bytes --]
Hi all,
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.
I used the version in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* [ofa-general] Re: linux-next: manual merge of the infiniband tree
2008-07-25 3:44 linux-next: manual merge of the infiniband tree Stephen Rothwell
@ 2008-07-25 3:50 ` Roland Dreier
2008-07-25 4:36 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Roland Dreier @ 2008-07-25 3:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, general
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-25 4:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-25 3:44 linux-next: manual merge of the infiniband tree Stephen Rothwell
2008-07-25 3:50 ` [ofa-general] " Roland Dreier
2008-07-25 4:36 ` Stephen Rothwell
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).