From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hariprasad Shenai <hariprasad@chelsio.com>,
Varun Prakash <varun@chelsio.com>
Subject: linux-next: manual merge of the target-merge tree with the net-next tree
Date: Mon, 29 Feb 2016 17:39:11 +1100 [thread overview]
Message-ID: <20160229173911.4fabe3f8@canb.auug.org.au> (raw)
Hi Nicholas,
Today's linux-next merge of the target-merge tree got a conflict in:
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
between commit:
ba9cee6aa67d ("cxgb4/iw_cxgb4: TOS support")
from the net-next tree and commit:
c973e2a3ff1b ("cxgb4: add definitions for iSCSI target ULD")
from the target-merge tree.
I fixed it up (the latter was a superset of the former) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-29 6:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 6:39 Stephen Rothwell [this message]
2016-03-01 5:39 ` linux-next: manual merge of the target-merge tree with the net-next tree Nicholas A. Bellinger
2016-03-01 5:52 ` 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=20160229173911.4fabe3f8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=hariprasad@chelsio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=netdev@vger.kernel.org \
--cc=varun@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).