Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/808000/?format=api
{ "id": 808000, "url": "http://patchwork.ozlabs.org/api/1.2/patches/808000/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170831134702.7fc1bd57@canb.auug.org.au/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170831134702.7fc1bd57@canb.auug.org.au>", "list_archive_url": null, "date": "2017-08-31T03:47:02", "name": "linux-next: manual merge of the tip tree with the net-next tree", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "9d30cc9dcdc92e6c3bd22a485ccbdc81f2d376be", "submitter": { "id": 31, "url": "http://patchwork.ozlabs.org/api/1.2/people/31/?format=api", "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170831134702.7fc1bd57@canb.auug.org.au/mbox/", "series": [ { "id": 734, "url": "http://patchwork.ozlabs.org/api/1.2/series/734/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=734", "date": "2017-08-31T03:47:02", "name": "linux-next: manual merge of the tip tree with the net-next tree", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/734/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808000/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808000/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tsecure) header.d=canb.auug.org.au header.i=@canb.auug.org.au\n\theader.b=\"oIQ/mOss\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjSxL18Dmz9sNr\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 31 Aug 2017 13:47:18 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751301AbdHaDrG (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tWed, 30 Aug 2017 23:47:06 -0400", "from ozlabs.org ([103.22.144.67]:49917 \"EHLO ozlabs.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1750948AbdHaDrE (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tWed, 30 Aug 2017 23:47:04 -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 3xjSx25dq7z9s06;\n\tThu, 31 Aug 2017 13:47:02 +1000 (AEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;\n\ts=201702; t=1504151223;\n\tbh=Mrg9oLtVbeHdlyF90Y2nvBw9Fs5JLnp8TzZFRZ3EdcA=;\n\th=Date:From:To:Cc:Subject:From;\n\tb=oIQ/mOsshfXmP1OL0Gg9ix8UhgqNs2FtiD6rsft9bWoxtSss+sJIViMfrmCX8kkY2\n\tFTv7Sb5H7xO4JU30t/GMHTMwvZpQ3BFgvv4kvP9WwLvMv8crsIUQUz+SsP+/SXXNmb\n\txmRGFCm7gzyHcZ7/pomAp3hbNGsAtPO7nhztWOW46Ty5hkW521YiT/IWfekCCKH75r\n\tPunBNJUMpG4KmNNbzjN4bzUHvlEVGL7ivRgt27yXysu3UaOhXIo4Hx/8UBupW3XOGl\n\tzfkFf3hGeOvH/2x3Bourz5SYe6XPSt3oI+yO4+G7bwGiRWYVN6HpYBtaBkYqUQXdmq\n\tbXl6LyCMFnD5g==", "Date": "Thu, 31 Aug 2017 13:47:02 +1000", "From": "Stephen Rothwell <sfr@canb.auug.org.au>", "To": "Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,\n\t\"H. Peter Anvin\" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>,\n\tDavid Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>", "Cc": "Linux-Next Mailing List <linux-next@vger.kernel.org>,\n\tLinux Kernel Mailing List <linux-kernel@vger.kernel.org>,\n\tIntiyaz Basha <intiyaz.basha@cavium.com>,\n\tYing Huang <ying.huang@intel.com>", "Subject": "linux-next: manual merge of the tip tree with the net-next tree", "Message-ID": "<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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Hi all,\n\nToday's linux-next merge of the tip tree got a conflict in:\n\n drivers/net/ethernet/cavium/liquidio/lio_main.c\n\nbetween commit:\n\n d1d97ee6e3a8 (\"liquidio: moved liquidio_napi_drv_callback to lio_core.c\")\n\nfrom the net-next tree and commit:\n\n 966a967116e6 (\"smp: Avoid using two cache lines for struct call_single_data\")\n\nfrom the tip tree.\n\nI fixed it up (I added the blow merge fix patch) and can carry the fix\nas necessary. This is now fixed as far as linux-next is concerned, but\nany non trivial conflicts should be mentioned to your upstream maintainer\nwhen your tree is submitted for merging. You may also want to consider\ncooperating with the maintainer of the conflicting tree to minimise any\nparticularly complex conflicts.\n\nFrom: Stephen Rothwell <sfr@canb.auug.org.au>\nDate: Thu, 31 Aug 2017 13:42:50 +1000\nSubject: [PATCH] liquidio: fix for merge with \"smp: Avoid using two cache\n lines for struct call_single_data\"\n\nSigned-off-by: Stephen Rothwell <sfr@canb.auug.org.au>\n---\n drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c\nindex 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", "prefixes": [] }