[{"id":1762902,"web_url":"http://patchwork.ozlabs.org/comment/1762902/","msgid":"<20170905100546.4b20136f@canb.auug.org.au>","list_archive_url":null,"date":"2017-09-05T00:05:46","subject":"Re: linux-next: manual merge of the tip tree with the net-next tree","submitter":{"id":31,"url":"http://patchwork.ozlabs.org/api/people/31/","name":"Stephen Rothwell","email":"sfr@canb.auug.org.au"},"content":"Hi Dave,\n\nOn Thu, 31 Aug 2017 13:47:02 +1000 Stephen Rothwell wrote:\n>\n> Today's linux-next merge of the tip tree got a conflict in:\n> \n> drivers/net/ethernet/cavium/liquidio/lio_main.c\n> \n> between commit:\n> \n> d1d97ee6e3a8 (\"liquidio: moved liquidio_napi_drv_callback to lio_core.c\")\n> \n> from the net-next tree and commit:\n> \n> 966a967116e6 (\"smp: Avoid using two cache lines for struct call_single_data\")\n> \n> from the tip tree.\n> \n> I fixed it up (I added the blow merge fix patch) and can carry the fix\n> as necessary. This is now fixed as far as linux-next is concerned, but\n> any non trivial conflicts should be mentioned to your upstream maintainer\n> when your tree is submitted for merging. You may also want to consider\n> cooperating with the maintainer of the conflicting tree to minimise any\n> particularly complex conflicts.\n> \n> From: Stephen Rothwell \n> Date: Thu, 31 Aug 2017 13:42:50 +1000\n> Subject: [PATCH] liquidio: fix for merge with \"smp: Avoid using two cache\n> lines for struct call_single_data\"\n> \n> Signed-off-by: Stephen Rothwell \n> ---\n> drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c\n> index 0e7896cdb295..23f6b60030c5 100644\n> --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c\n> +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c\n> @@ -613,7 +613,7 @@ static void liquidio_napi_drv_callback(void *arg)\n> \t droq->cpu_id == this_cpu) {\n> \t\tnapi_schedule_irqoff(&droq->napi);\n> \t} else {\n> -\t\tstruct call_single_data *csd = &droq->csd;\n> +\t\tcall_single_data_t *csd = &droq->csd;\n> \n> \t\tcsd->func = napi_schedule_wrapper;\n> \t\tcsd->info = &droq->napi;\n\nThe above merge fix patch is now needed when I merge the net-next tree\nwith Linus' tree (since the tip commit has been merged by Linus).","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tsecure) header.d=canb.auug.org.au header.i=@canb.auug.org.au\n\theader.b=\"BDFJol6V\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmRnc0cMHz9sPt\n\tfor ;\n\tTue, 5 Sep 2017 10:05:56 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754079AbdIEAFv (ORCPT );\n\tMon, 4 Sep 2017 20:05:51 -0400","from ozlabs.org ([103.22.144.67]:45991 \"EHLO ozlabs.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754027AbdIEAFt (ORCPT );\n\tMon, 4 Sep 2017 20:05:49 -0400","from authenticated.ozlabs.org (localhost [127.0.0.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPSA id 3xmRnR0qDWz9s76;\n\tTue, 5 Sep 2017 10:05:47 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;\n\ts=201702; t=1504569947;\n\tbh=heF2V35m2rDkzdAs4FtVgRXzpBi4+l1ZuQtqMFciTbA=;\n\th=Date:From:To:Cc:Subject:In-Reply-To:References:From;\n\tb=BDFJol6VHtqhmLkccZ80zpRjkRRfkH2dZJ5dNS/ozcqIPxSpEOolXFHeT0tI3+kwt\n\t3sG9BXMK2k1SoTROmPmwsFyS2Mji3xEUIVr5ja+gWj0ZwaW+e815cetluPLjLilEG0\n\tkCpyveK7Mey09mcdLfoAM2OiwgK8iPWfE2nyga7USN3SAMynNxmvQ7LGfCj+WdNHbu\n\te+QOajdh2HdDp2HAN8fLyxhB14DwlzlEreegC1VoWfQ1yEoNGX67lGoTLWHQ7fd90G\n\tm0rck9DSHWBWsLAvx8SL+JgbBnob1yyHJNboCbid7Vx4ERLi+naH+Ws61mtmPQ/dbz\n\tV+EQ4NE7CQ/sg==","Date":"Tue, 5 Sep 2017 10:05:46 +1000","From":"Stephen Rothwell ","To":"David Miller , Networking ","Cc":"Thomas Gleixner , Ingo Molnar ,\n\t\"H. Peter Anvin\" , Peter Zijlstra ,\n\tLinux-Next Mailing List ,\n\tLinux Kernel Mailing List ,\n\tIntiyaz Basha ,\n\tYing Huang ","Subject":"Re: linux-next: manual merge of the tip tree with the net-next tree","Message-ID":"<20170905100546.4b20136f@canb.auug.org.au>","In-Reply-To":"<20170831134702.7fc1bd57@canb.auug.org.au>","References":"<20170831134702.7fc1bd57@canb.auug.org.au>","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]