public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Michael Ellerman <mpe@ellerman•id.au>
To: Greg KH <greg@kroah•com>, Doug Ledford <dledford@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Matan Barak <matanb@mellanox•com>,
	Or Gerlitz <ogerlitz@mellanox•com>, Mike Shuey <shuey@purdue•edu>
Subject: linux-next: manual merge of the staging tree with the rdma tree
Date: Mon, 15 Jun 2015 18:12:11 +1000	[thread overview]
Message-ID: <1434355931.19706.5.camel@ellerman.id.au> (raw)

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c between commit 8e37210b38fb
"IB/core: Change ib_create_cq to use struct ib_cq_init_attr" from the rdma tree
and commit ec3d17c0ed2e "staging: lustre: lnet: o2iblnd: code cleanup - align
whitespace" from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

cheers


diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index c41b5575df05,48454a576b7a..000000000000
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@@ -642,18 -643,17 +643,18 @@@ kib_conn_t *kiblnd_create_conn(kib_peer
  	 * she must dispose of 'cmid'.  (Actually I'd block forever if I tried
  	 * to destroy 'cmid' here since I'm called from the CM which still has
  	 * its ref on 'cmid'). */
- 	rwlock_t		*glock = &kiblnd_data.kib_global_lock;
- 	kib_net_t	      *net = peer->ibp_ni->ni_data;
- 	kib_dev_t	      *dev;
+ 	rwlock_t *glock = &kiblnd_data.kib_global_lock;
+ 	kib_net_t *net = peer->ibp_ni->ni_data;
+ 	kib_dev_t *dev;
  	struct ib_qp_init_attr *init_qp_attr;
- 	struct kib_sched_info	*sched;
- 	struct ib_cq_init_attr  cq_attr = {};
- 	kib_conn_t		*conn;
- 	struct ib_cq		*cq;
- 	unsigned long		flags;
- 	int			cpt;
- 	int			rc;
- 	int			i;
+ 	struct kib_sched_info *sched;
++	struct ib_cq_init_attr cq_attr = {};
+ 	kib_conn_t *conn;
+ 	struct ib_cq *cq;
+ 	unsigned long flags;
+ 	int cpt;
+ 	int rc;
+ 	int i;
  
  	LASSERT(net != NULL);
  	LASSERT(!in_interrupt());

next             reply	other threads:[~2015-06-15  8:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-15  8:12 Michael Ellerman [this message]
2015-06-16  4:48 ` linux-next: manual merge of the staging tree with the rdma tree Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2015-08-17  8:13 Stephen Rothwell
2015-08-17 16:03 ` Greg KH
2015-11-01 13:48 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=1434355931.19706.5.camel@ellerman.id.au \
    --to=mpe@ellerman$(echo .)id.au \
    --cc=dledford@redhat$(echo .)com \
    --cc=greg@kroah$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=matanb@mellanox$(echo .)com \
    --cc=ogerlitz@mellanox$(echo .)com \
    --cc=shuey@purdue$(echo .)edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox