Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1299553
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the rdma tree with the nfsd tree |
| Date | 2015-12-31 03:40 +0100 |
| Message-ID | <qLBjH-6Ik-5@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Hi Doug,
Today's linux-next merge of the rdma tree got conflicts in a quite a
few files between (mostly, I think) commit:
6c7b6d2d442c ("IB: merge struct ib_device_attr into struct ib_device")
from the nfsd tree and various commits from the rdma tree.
It would have taken me considerable time to fix the conflicts up, so I
have dropped teh rdma tree for today (just because it was merged second).
Please have a conversation and figure out how you are going to cooperate
and get these conflicts fixed e.g. set up a stable branch with Christoph's
commit (and any other conflicting commits) in it and merge that into
both trees.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the rdma tree with the nfsd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 03:40 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 02:50 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Doug Ledford <dledford@redhat.com> - 2016-01-04 04:00 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-04 20:40 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 13:10 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Christoph Hellwig <hch@lst.de> - 2016-01-06 13:20 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Christoph Hellwig <hch@lst.de> - 2016-01-06 13:30 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Doug Ledford <dledford@redhat.com> - 2016-01-06 19:00 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 15:30 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 16:30 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 17:40 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Anna Schumaker <Anna.Schumaker@netapp.com> - 2016-01-06 17:50 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 13:30 +0100
Re: linux-next: manual merge of the rdma tree with the nfsd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-06 17:30 +0100
csiph-web