Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1345516
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the target-merge tree with the net-next tree |
| Date | 2016-02-29 07:40 +0100 |
| Message-ID | <r7pER-7pa-1@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
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
csiph-web