Hi all,
On Thu, 2 Aug 2018 12:05:03 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/rds/ib_send.c
>
> between commit:
>
> d34ac5cd3a73 ("RDMA, core and ULPs: Declare ib_post_send() and ib_post_recv() arguments const")
>
> from the rdma tree and commit:
>
> 87f70132b08e ("rds: remove redundant variable 'rds_ibdev'")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc net/rds/ib_send.c
> index 8ac80c1b051e,c8dd3125d398..000000000000
> --- a/net/rds/ib_send.c
> +++ b/net/rds/ib_send.c
> @@@ -758,8 -758,7 +758,7 @@@ int rds_ib_xmit_atomic(struct rds_conne
> {
> struct rds_ib_connection *ic = conn->c_transport_data;
> struct rds_ib_send_work *send = NULL;
> - struct ib_send_wr *failed_wr;
> + const struct ib_send_wr *failed_wr;
> - struct rds_ib_device *rds_ibdev;
> u32 pos;
> u32 work_alloc;
> int ret;
This is now a conflict between Linux' tree and the rdma tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpwNU2TF8M8X.pgp
Description: OpenPGP digital signature
