From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Thu, 31 Aug 2017 13:47:02 +1000 Message-ID: <20170831134702.7fc1bd57@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:49917 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbdHaDrE (ORCPT ); Wed, 30 Aug 2017 23:47:04 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Intiyaz Basha , Ying Huang Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/net/ethernet/cavium/liquidio/lio_main.c between commit: d1d97ee6e3a8 ("liquidio: moved liquidio_napi_drv_callback to lio_core.c") from the net-next tree and commit: 966a967116e6 ("smp: Avoid using two cache lines for struct call_single_data") from the tip tree. I fixed it up (I added the blow merge fix patch) 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. From: Stephen Rothwell Date: Thu, 31 Aug 2017 13:42:50 +1000 Subject: [PATCH] liquidio: fix for merge with "smp: Avoid using two cache lines for struct call_single_data" Signed-off-by: Stephen Rothwell --- drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index 0e7896cdb295..23f6b60030c5 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -613,7 +613,7 @@ static void liquidio_napi_drv_callback(void *arg) droq->cpu_id == this_cpu) { napi_schedule_irqoff(&droq->napi); } else { - struct call_single_data *csd = &droq->csd; + call_single_data_t *csd = &droq->csd; csd->func = napi_schedule_wrapper; csd->info = &droq->napi; -- 2.13.2 -- Cheers, Stephen Rothwell