From: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Hariprasad Shenai <hariprasad@chelsio•com>,
Varun Prakash <varun@chelsio•com>,
target-devel <target-devel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the target-merge tree with the net-next tree
Date: Mon, 29 Feb 2016 21:39:33 -0800 [thread overview]
Message-ID: <1456810773.19657.197.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20160229173911.4fabe3f8@canb.auug.org.au>
On Mon, 2016-02-29 at 17:39 +1100, Stephen Rothwell wrote:
> 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).
>
Thanks Stephen.
I'll include a note to Linus in target-pending/for-next-merge PULL
request, and will plan to wait until after DaveM's net-next is merged
for v4.6-rc0.
next prev parent reply other threads:[~2016-03-01 5:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 6:39 linux-next: manual merge of the target-merge tree with the net-next tree Stephen Rothwell
2016-03-01 5:39 ` Nicholas A. Bellinger [this message]
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=1456810773.19657.197.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=hariprasad@chelsio$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=target-devel@vger$(echo .)kernel.org \
--cc=varun@chelsio$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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