From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>,
Roland Dreier <roland@kernel.org>,
linux-rdma@vger.kernel.org, Vipul Pandya <vipul@chelsio.com>
Subject: linux-next: manual merge of the net-next tree with the infiniband tree
Date: Thu, 18 Apr 2013 13:18:43 +1000 [thread overview]
Message-ID: <20130418131843.bfeb6b1ad5fba1b0f706076e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/infiniband/hw/cxgb4/qp.c between commit 5b0c275926b8
("RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled") from the
infiniband tree and commit 9919d5bd01b9 ("RDMA/cxgb4: Fix onchip queue
support for T5") from the net-next tree.
I think that they are 2 different fixes for the same problem, so I just
used the net-next version and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-18 3:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 3:18 Stephen Rothwell [this message]
[not found] ` <20130418131843.bfeb6b1ad5fba1b0f706076e-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-24 17:53 ` linux-next: manual merge of the net-next tree with the infiniband tree Thadeu Lima de Souza Cascardo
[not found] ` <20130424175304.GA701-kqNz3JI7O+u3AZEqMmYM8VaTQe2KTcn/@public.gmane.org>
2013-04-26 3:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-11-27 0:47 Stephen Rothwell
2012-11-27 6:43 ` Or Gerlitz
2012-07-12 2:13 Stephen Rothwell
2012-07-12 12:57 ` Hadar Hen Zion
2012-07-16 8:34 ` Jack Morgenstein
2012-07-12 2:09 Stephen Rothwell
2012-07-12 12:59 ` Hadar Hen Zion
2012-07-16 8:33 ` Jack Morgenstein
2012-04-24 2:06 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=20130418131843.bfeb6b1ad5fba1b0f706076e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cascardo@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roland@kernel.org \
--cc=vipul@chelsio.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).