Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1345516 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-02-29 07:40 +0100 |
| Last post | 2016-03-01 07:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the target-merge tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-29 07:40 +0100
Re: linux-next: manual merge of the target-merge tree with the net-next tree "Nicholas A. Bellinger" <nab@linux-iscsi.org> - 2016-03-01 06:40 +0100
Re: linux-next: manual merge of the target-merge tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-01 07:00 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-02-29 07:40 +0100 |
| Subject | linux-next: manual merge of the target-merge tree with the net-next tree |
| Message-ID | <r7pER-7pa-1@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | "Nicholas A. Bellinger" <nab@linux-iscsi.org> |
|---|---|
| Date | 2016-03-01 06:40 +0100 |
| Subject | Re: linux-next: manual merge of the target-merge tree with the net-next tree |
| Message-ID | <r7Lcl-4Ri-1@gated-at.bofh.it> |
| In reply to | #1345516 |
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.
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-03-01 07:00 +0100 |
| Subject | Re: linux-next: manual merge of the target-merge tree with the net-next tree |
| Message-ID | <r7LvI-4Zu-1@gated-at.bofh.it> |
| In reply to | #1346376 |
Hi Nicholas, On Mon, 29 Feb 2016 21:39:33 -0800 "Nicholas A. Bellinger" <nab@linux-iscsi.org> wrote: > > 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. The order doesn't really matter and Linus is cleverer than I am :-) -- Cheers, Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web