* linux-next: manual merge of the staging tree with the rdma tree
@ 2015-06-15 8:12 Michael Ellerman
2015-06-16 4:48 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Michael Ellerman @ 2015-06-15 8:12 UTC (permalink / raw)
To: Greg KH, Doug Ledford
Cc: linux-next, linux-kernel, Matan Barak, Or Gerlitz, Mike Shuey
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());
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the staging tree with the rdma tree
2015-06-15 8:12 linux-next: manual merge of the staging tree with the rdma tree Michael Ellerman
@ 2015-06-16 4:48 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2015-06-16 4:48 UTC (permalink / raw)
To: Michael Ellerman
Cc: Doug Ledford, linux-next, linux-kernel, Matan Barak, Or Gerlitz,
Mike Shuey
On Mon, Jun 15, 2015 at 06:12:11PM +1000, Michael Ellerman wrote:
> 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;
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the staging tree with the rdma tree
@ 2015-08-17 8:13 Stephen Rothwell
2015-08-17 16:03 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-08-17 8:13 UTC (permalink / raw)
To: Greg KH, Doug Ledford
Cc: linux-next, linux-kernel, Christian Gromm, Steve Wise,
Dennis Dalessandro
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/Kconfig
drivers/staging/Makefile
between commit:
c2347d1b409d ("RDMA/amso1100: deprecate the amso1100 provider")
17465e48756f ("IB/ipath: Move ipath driver to staging.")
97748be1d6d0 ("Move hfi1 to staging")
from the rdma tree and commit:
57562a72414c ("Staging: most: add MOST driver's core module")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/Kconfig
index 3f9f058f9ba7,e29293c0c71e..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -112,10 -108,6 +108,12 @@@ source "drivers/staging/fsl-mc/Kconfig
source "drivers/staging/wilc1000/Kconfig"
+source "drivers/staging/amso1100/Kconfig"
+
+source "drivers/staging/ipath/Kconfig"
+
+source "drivers/staging/hfi1/Kconfig"
+
+ source "drivers/staging/most/Kconfig"
+
endif # STAGING
diff --cc drivers/staging/Makefile
index 20f827632349,50824dde2c09..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -48,6 -46,4 +46,7 @@@ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) +
obj-$(CONFIG_FB_TFT) += fbtft/
obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
obj-$(CONFIG_WILC1000) += wilc1000/
+obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/
+obj-$(CONFIG_INFINIBAND_IPATH) += ipath/
+obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
+ obj-$(CONFIG_MOST) += most/
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the staging tree with the rdma tree
2015-08-17 8:13 Stephen Rothwell
@ 2015-08-17 16:03 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2015-08-17 16:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, linux-next, linux-kernel, Christian Gromm,
Steve Wise, Dennis Dalessandro
On Mon, Aug 17, 2015 at 06:13:12PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/Kconfig
> drivers/staging/Makefile
>
> between commit:
>
> c2347d1b409d ("RDMA/amso1100: deprecate the amso1100 provider")
> 17465e48756f ("IB/ipath: Move ipath driver to staging.")
> 97748be1d6d0 ("Move hfi1 to staging")
>
> from the rdma tree and commit:
>
> 57562a72414c ("Staging: most: add MOST driver's core module")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the staging tree with the rdma tree
@ 2015-11-01 13:48 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-11-01 13:48 UTC (permalink / raw)
To: Greg KH, Doug Ledford
Cc: linux-next, linux-kernel, Christoph Hellwig, Jeff Becker
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
between commit:
e622f2f4ad21 ("IB: split struct ib_send_wr")
from the rdma tree and commit:
d0bed03524f3 ("staging/lustre: fix block comment formatting")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index 993d1ff9ba21,5f78b42b427a..000000000000
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@@ -511,30 -490,28 +492,28 @@@ typedef struct kib_r
typedef struct kib_tx /* transmit message */
{
- struct list_head tx_list; /* queue on idle_txs ibc_tx_queue
- * etc. */
- kib_tx_pool_t *tx_pool; /* pool I'm from */
- struct kib_conn *tx_conn; /* owning conn */
- short tx_sending; /* # tx callbacks outstanding */
- short tx_queued; /* queued for sending */
- short tx_waiting; /* waiting for peer */
- int tx_status; /* LNET completion status */
- unsigned long tx_deadline; /* completion deadline */
- __u64 tx_cookie; /* completion cookie */
- lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on
- * completion */
- kib_msg_t *tx_msg; /* message buffer (host vaddr) */
- __u64 tx_msgaddr; /* message buffer (I/O addr) */
+ struct list_head tx_list; /* queue on idle_txs ibc_tx_queue etc. */
+ kib_tx_pool_t *tx_pool; /* pool I'm from */
+ struct kib_conn *tx_conn; /* owning conn */
+ short tx_sending; /* # tx callbacks outstanding */
+ short tx_queued; /* queued for sending */
+ short tx_waiting; /* waiting for peer */
+ int tx_status; /* LNET completion status */
+ unsigned long tx_deadline; /* completion deadline */
+ __u64 tx_cookie; /* completion cookie */
+ lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on completion */
+ kib_msg_t *tx_msg; /* message buffer (host vaddr) */
+ __u64 tx_msgaddr; /* message buffer (I/O addr) */
DECLARE_PCI_UNMAP_ADDR(tx_msgunmap); /* for dma_unmap_single() */
- int tx_nwrq; /* # send work items */
- struct ib_rdma_wr *tx_wrq; /* send work items... */
- struct ib_sge *tx_sge; /* ...and their memory */
- kib_rdma_desc_t *tx_rd; /* rdma descriptor */
- int tx_nfrags; /* # entries in... */
- struct scatterlist *tx_frags; /* dma_map_sg descriptor */
- __u64 *tx_pages; /* rdma phys page addrs */
- kib_fmr_t fmr; /* FMR */
- int tx_dmadir; /* dma direction */
+ int tx_nwrq; /* # send work items */
- struct ib_send_wr *tx_wrq; /* send work items... */
++ struct ib_rdma_wr *tx_wrq; /* send work items... */
+ struct ib_sge *tx_sge; /* ...and their memory */
+ kib_rdma_desc_t *tx_rd; /* rdma descriptor */
+ int tx_nfrags; /* # entries in... */
+ struct scatterlist *tx_frags; /* dma_map_sg descriptor */
+ __u64 *tx_pages; /* rdma phys page addrs */
+ kib_fmr_t fmr; /* FMR */
+ int tx_dmadir; /* dma direction */
} kib_tx_t;
typedef struct kib_connvars {
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-11-01 13:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-15 8:12 linux-next: manual merge of the staging tree with the rdma tree Michael Ellerman
2015-06-16 4:48 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).