Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2165656/?format=api
{ "id": 2165656, "url": "http://patchwork.ozlabs.org/api/patches/2165656/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251117134912.18566-2-larysa.zaremba@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20251117134912.18566-2-larysa.zaremba@intel.com>", "list_archive_url": null, "date": "2025-11-17T13:48:41", "name": "[iwl-next,v5,01/15] virtchnl: create 'include/linux/intel' and move necessary header files", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "ff8b56553c1e67f11adf585e9231225988d24256", "submitter": { "id": 84900, "url": "http://patchwork.ozlabs.org/api/people/84900/?format=api", "name": "Larysa Zaremba", "email": "larysa.zaremba@intel.com" }, "delegate": { "id": 109701, "url": "http://patchwork.ozlabs.org/api/users/109701/?format=api", "username": "anguy11", "first_name": "Anthony", "last_name": "Nguyen", "email": "anthony.l.nguyen@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251117134912.18566-2-larysa.zaremba@intel.com/mbox/", "series": [ { "id": 482391, "url": "http://patchwork.ozlabs.org/api/series/482391/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=482391", "date": "2025-11-17T13:48:40", "name": "Introduce iXD driver", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/482391/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2165656/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2165656/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=V6VuG1Kb;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4d98HZ0SQ3z1yDb\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 18 Nov 2025 00:49:29 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 1CC2060717;\n\tMon, 17 Nov 2025 13:49:28 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id zrSPUJkLrJQo; Mon, 17 Nov 2025 13:49:26 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 3BC3960A9D;\n\tMon, 17 Nov 2025 13:49:26 +0000 (UTC)", "from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by lists1.osuosl.org (Postfix) with ESMTP id 0D34CD5\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:25 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id 0ABE98179A\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:25 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 183j6JKtJRtp for <intel-wired-lan@lists.osuosl.org>;\n Mon, 17 Nov 2025 13:49:23 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [198.175.65.19])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 24ABD81764\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:23 +0000 (UTC)", "from fmviesa008.fm.intel.com ([10.60.135.148])\n by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 17 Nov 2025 05:49:23 -0800", "from irvmail002.ir.intel.com ([10.43.11.120])\n by fmviesa008.fm.intel.com with ESMTP; 17 Nov 2025 05:49:17 -0800", "from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id C213D37E36;\n Mon, 17 Nov 2025 13:49:14 +0000 (GMT)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3BC3960A9D", "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 24ABD81764" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1763387366;\n\tbh=H4YeRlYvz7HetHrvOlfzMvDcESMhijYJwZjBtaso9+0=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=V6VuG1KbRPFfmKJr1Uhu13q+Br6UNMZFeWUBuSJ18g0ScRz9+L7aUOyz4SczOGyzP\n\t 36MV00qkj6QmUg17RQaGok4o+PObH7V4tVRx3CE+Vq/bu60pDkkr5hSFVVKmRmDPxE\n\t jYC6AwPt3pGHWbnrOT5oupo3e7VpODicSf4y9+KkSEV0QE3h/e2/905U3UIyTBTPo+\n\t BBagS7H1p9It72DI1bnD9WEdV570xFu+qiS1W9SFbb2+vkaeUPxr2sazQGappV4VcK\n\t oMW2gqDD9QT9i2QeyXv8I5JXS/BrnkDgsnX1e961wBeLlnBVJLchEDNqfqtqhQrH7q\n\t V2JA2zCaH3V8A==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.19;\n helo=mgamail.intel.com; envelope-from=larysa.zaremba@intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp1.osuosl.org 24ABD81764", "X-CSE-ConnectionGUID": [ "ptLXNWelS9Wl44jN1rzbog==", "t0jfD22RSoq/abG1USJ1UQ==" ], "X-CSE-MsgGUID": [ "vW0lOEBBRFKG6ivE2SUuiA==", "gQ5y6zFwRP6y4cPti2ymMQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11616\"; a=\"65266936\"", "E=Sophos;i=\"6.19,311,1754982000\"; d=\"scan'208\";a=\"65266936\"", "E=Sophos;i=\"6.19,311,1754982000\"; d=\"scan'208\";a=\"190684001\"" ], "X-ExtLoop1": "1", "From": "Larysa Zaremba <larysa.zaremba@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, Tony Nguyen <anthony.l.nguyen@intel.com>", "Cc": "aleksander.lobakin@intel.com, sridhar.samudrala@intel.com,\n \"Singhai, Anjali\" <anjali.singhai@intel.com>,\n Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,\n Larysa Zaremba <larysa.zaremba@intel.com>,\n \"Fijalkowski, Maciej\" <maciej.fijalkowski@intel.com>,\n Emil Tantilov <emil.s.tantilov@intel.com>,\n Madhu Chittim <madhu.chittim@intel.com>, Josh Hay <joshua.a.hay@intel.com>,\n \"Keller, Jacob E\" <jacob.e.keller@intel.com>,\n jayaprakash.shanmugam@intel.com, natalia.wochtman@intel.com,\n Jiri Pirko <jiri@resnulli.us>, \"David S. Miller\" <davem@davemloft.net>,\n Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,\n Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,\n Jonathan Corbet <corbet@lwn.net>,\n Richard Cochran <richardcochran@gmail.com>,\n Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Andrew Lunn <andrew+netdev@lunn.ch>, netdev@vger.kernel.org,\n linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,\n Krzysztof Czurylo <krzysztof.czurylo@intel.com>", "Date": "Mon, 17 Nov 2025 14:48:41 +0100", "Message-ID": "<20251117134912.18566-2-larysa.zaremba@intel.com>", "X-Mailer": "git-send-email 2.47.0", "In-Reply-To": "<20251117134912.18566-1-larysa.zaremba@intel.com>", "References": "<20251117134912.18566-1-larysa.zaremba@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1763387363; x=1794923363;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=y0TMaiJnK5wBhVAW+VGJTW8TqcVe+C2/PZ9ZMt6KYwE=;\n b=Pr6+JP4kL5noPrBOvGzz1IWuOjAM6s9GOwCVIfu4fkmRhkGFCqRFVgsm\n MlfcAJmiLC/Jal6DRlxFK6SOfiTDe9u/B3GZXIIp3QvH/QoJVHKtEDMbc\n JJ8Wk7FhtnngPq/f2LQv0mqOA14zbgJuvdM7fZZW+5UDc/J/T6u2VxcgI\n CAfU7jY+NNXR8wYC7ItsrQbJMQbHErIaoapclLKMHNYVwhsLguRj6o1Lu\n jy+Yg5Fp7eELmUXPakyRbEF5lriCvWVgbdGdyTZNh1eepHWhMz2MnTdfy\n 0fmUVMngpkTsS4CR2mxVNSMmxd8Sm60hOWqIfq8aIMlhb0+RHL2gdkvG4\n g==;", "X-Mailman-Original-Authentication-Results": [ "smtp1.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com", "smtp1.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=Pr6+JP4k" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v5 01/15] virtchnl: create\n 'include/linux/intel' and move necessary header files", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Victor Raj <victor.raj@intel.com>\n\ninclude/linux/net houses a single folder \"intel\", meanwhile\ninclude/linux/intel is vacant. On top of that, it would be useful to place\nall iavf headers together with other intel networking headers.\n\nMove abovementioned intel header files into new folder include/linux/intel.\nAlso, assign new folder to both intel and general networking maintainers.\n\nSuggested-by: Alexander Lobakin <aleksander.lobakin@intel.com>\nReviewed-by: Sridhar Samudrala <sridhar.samudrala@intel.com>\nSigned-off-by: Victor Raj <victor.raj@intel.com>\nSigned-off-by: Larysa Zaremba <larysa.zaremba@intel.com>\n---\n MAINTAINERS | 6 +++---\n drivers/infiniband/hw/irdma/i40iw_if.c | 2 +-\n drivers/infiniband/hw/irdma/icrdma_if.c | 2 +-\n drivers/infiniband/hw/irdma/ig3rdma_if.c | 2 +-\n drivers/infiniband/hw/irdma/main.c | 2 +-\n drivers/infiniband/hw/irdma/main.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e.h | 4 ++--\n drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_client.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 ++--\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_prototype.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_types.h | 4 +---\n drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +-\n drivers/net/ethernet/intel/ice/ice.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_base.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_common.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_flow.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_idc_int.h | 4 ++--\n drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_type.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +-\n drivers/net/ethernet/intel/ice/virt/virtchnl.h | 2 +-\n drivers/net/ethernet/intel/idpf/idpf.h | 6 +++---\n drivers/net/ethernet/intel/idpf/idpf_txrx.h | 2 +-\n drivers/net/ethernet/intel/idpf/idpf_virtchnl.h | 2 +-\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 +-\n drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 2 +-\n drivers/net/ethernet/intel/libie/adminq.c | 2 +-\n drivers/net/ethernet/intel/libie/fwlog.c | 2 +-\n drivers/net/ethernet/intel/libie/rx.c | 2 +-\n include/linux/{net => }/intel/i40e_client.h | 0\n include/linux/{net => }/intel/iidc_rdma.h | 0\n include/linux/{net => }/intel/iidc_rdma_ice.h | 0\n include/linux/{net => }/intel/iidc_rdma_idpf.h | 0\n include/linux/{net => }/intel/libie/adminq.h | 0\n include/linux/{net => }/intel/libie/fwlog.h | 2 +-\n include/linux/{net => }/intel/libie/pctype.h | 0\n include/linux/{net => }/intel/libie/rx.h | 0\n include/linux/{avf => intel}/virtchnl.h | 0\n .../ethernet/intel/idpf => include/linux/intel}/virtchnl2.h | 0\n .../intel/idpf => include/linux/intel}/virtchnl2_lan_desc.h | 0\n 55 files changed, 52 insertions(+), 54 deletions(-)\n rename include/linux/{net => }/intel/i40e_client.h (100%)\n rename include/linux/{net => }/intel/iidc_rdma.h (100%)\n rename include/linux/{net => }/intel/iidc_rdma_ice.h (100%)\n rename include/linux/{net => }/intel/iidc_rdma_idpf.h (100%)\n rename include/linux/{net => }/intel/libie/adminq.h (100%)\n rename include/linux/{net => }/intel/libie/fwlog.h (98%)\n rename include/linux/{net => }/intel/libie/pctype.h (100%)\n rename include/linux/{net => }/intel/libie/rx.h (100%)\n rename include/linux/{avf => intel}/virtchnl.h (100%)\n rename {drivers/net/ethernet/intel/idpf => include/linux/intel}/virtchnl2.h (100%)\n rename {drivers/net/ethernet/intel/idpf => include/linux/intel}/virtchnl2_lan_desc.h (100%)", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 37f4278db851..ad4d53135981 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -12520,8 +12520,7 @@ T:\tgit git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git\n F:\tDocumentation/networking/device_drivers/ethernet/intel/\n F:\tdrivers/net/ethernet/intel/\n F:\tdrivers/net/ethernet/intel/*/\n-F:\tinclude/linux/avf/virtchnl.h\n-F:\tinclude/linux/net/intel/*/\n+F:\tinclude/linux/intel/\n \n INTEL ETHERNET PROTOCOL DRIVER FOR RDMA\n M:\tKrzysztof Czurylo <krzysztof.czurylo@intel.com>\n@@ -14229,7 +14228,7 @@ L:\tnetdev@vger.kernel.org\n S:\tMaintained\n T:\tgit https://github.com/alobakin/linux.git\n F:\tdrivers/net/ethernet/intel/libie/\n-F:\tinclude/linux/net/intel/libie/\n+F:\tinclude/linux/intel/libie/\n K:\tlibie\n \n LIBNVDIMM BTT: BLOCK TRANSLATION TABLE\n@@ -17892,6 +17891,7 @@ F:\tinclude/linux/fddidevice.h\n F:\tinclude/linux/hippidevice.h\n F:\tinclude/linux/if_*\n F:\tinclude/linux/inetdevice.h\n+F:\tinclude/linux/intel/\n F:\tinclude/linux/netdev*\n F:\tinclude/linux/platform_data/wiznet.h\n F:\tinclude/uapi/linux/cn_proc.h\ndiff --git a/drivers/infiniband/hw/irdma/i40iw_if.c b/drivers/infiniband/hw/irdma/i40iw_if.c\nindex 15e036ddaffb..7c019f9e386f 100644\n--- a/drivers/infiniband/hw/irdma/i40iw_if.c\n+++ b/drivers/infiniband/hw/irdma/i40iw_if.c\n@@ -2,7 +2,7 @@\n /* Copyright (c) 2015 - 2021 Intel Corporation */\n #include \"main.h\"\n #include \"i40iw_hw.h\"\n-#include <linux/net/intel/i40e_client.h>\n+#include <linux/intel/i40e_client.h>\n \n static struct i40e_client i40iw_client;\n \ndiff --git a/drivers/infiniband/hw/irdma/icrdma_if.c b/drivers/infiniband/hw/irdma/icrdma_if.c\nindex 27b191f61caf..b2e016c1c6ac 100644\n--- a/drivers/infiniband/hw/irdma/icrdma_if.c\n+++ b/drivers/infiniband/hw/irdma/icrdma_if.c\n@@ -2,7 +2,7 @@\n /* Copyright (c) 2015 - 2024 Intel Corporation */\n \n #include \"main.h\"\n-#include <linux/net/intel/iidc_rdma_ice.h>\n+#include <linux/intel/iidc_rdma_ice.h>\n \n static void icrdma_prep_tc_change(struct irdma_device *iwdev)\n {\ndiff --git a/drivers/infiniband/hw/irdma/ig3rdma_if.c b/drivers/infiniband/hw/irdma/ig3rdma_if.c\nindex 1bb42eb298ba..a0304b2e6cb8 100644\n--- a/drivers/infiniband/hw/irdma/ig3rdma_if.c\n+++ b/drivers/infiniband/hw/irdma/ig3rdma_if.c\n@@ -2,7 +2,7 @@\n /* Copyright (c) 2023 - 2024 Intel Corporation */\n \n #include \"main.h\"\n-#include <linux/net/intel/iidc_rdma_idpf.h>\n+#include <linux/intel/iidc_rdma_idpf.h>\n #include \"ig3rdma_hw.h\"\n \n static void ig3rdma_idc_core_event_handler(struct iidc_rdma_core_dev_info *cdev_info,\ndiff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c\nindex 95957d52883d..9781699ad57c 100644\n--- a/drivers/infiniband/hw/irdma/main.c\n+++ b/drivers/infiniband/hw/irdma/main.c\n@@ -1,7 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB\n /* Copyright (c) 2015 - 2021 Intel Corporation */\n #include \"main.h\"\n-#include <linux/net/intel/iidc_rdma_idpf.h>\n+#include <linux/intel/iidc_rdma_idpf.h>\n \n MODULE_ALIAS(\"i40iw\");\n MODULE_DESCRIPTION(\"Intel(R) Ethernet Protocol Driver for RDMA\");\ndiff --git a/drivers/infiniband/hw/irdma/main.h b/drivers/infiniband/hw/irdma/main.h\nindex 886b30da188a..bcbff04c6fe5 100644\n--- a/drivers/infiniband/hw/irdma/main.h\n+++ b/drivers/infiniband/hw/irdma/main.h\n@@ -29,7 +29,7 @@\n #include <linux/io-64-nonatomic-lo-hi.h>\n #endif\n #include <linux/auxiliary_bus.h>\n-#include <linux/net/intel/iidc_rdma.h>\n+#include <linux/intel/iidc_rdma.h>\n #include <rdma/ib_smi.h>\n #include <rdma/ib_verbs.h>\n #include <rdma/ib_pack.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex d2d03db2acec..2a9ec1bff8d5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -8,8 +8,8 @@\n #include <linux/pci.h>\n #include <linux/ptp_clock_kernel.h>\n #include <linux/types.h>\n-#include <linux/avf/virtchnl.h>\n-#include <linux/net/intel/i40e_client.h>\n+#include <linux/intel/virtchnl.h>\n+#include <linux/intel/i40e_client.h>\n #include <net/devlink.h>\n #include <net/pkt_cls.h>\n #include <net/udp_tunnel.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\nindex cc02a85ad42b..e70f0aa728b1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n@@ -4,7 +4,7 @@\n #ifndef _I40E_ADMINQ_CMD_H_\n #define _I40E_ADMINQ_CMD_H_\n \n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n #include <linux/bits.h>\n #include <linux/types.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c\nindex 518bc738ea3b..4dce3c6b2850 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_client.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c\n@@ -3,7 +3,7 @@\n \n #include <linux/list.h>\n #include <linux/errno.h>\n-#include <linux/net/intel/i40e_client.h>\n+#include <linux/intel/i40e_client.h>\n \n #include \"i40e.h\"\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex 59f5c1e810eb..dab9dfcf7bda 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -1,7 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n /* Copyright(c) 2013 - 2021 Intel Corporation. */\n \n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include <linux/bitfield.h>\n #include <linux/delay.h>\n #include <linux/etherdevice.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 86c72596617a..34224a56b110 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -3,7 +3,7 @@\n \n /* ethtool support for i40e */\n \n-#include <linux/net/intel/libie/pctype.h>\n+#include <linux/intel/libie/pctype.h>\n #include \"i40e_devids.h\"\n #include \"i40e_diag.h\"\n #include \"i40e_txrx_common.h\"\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f3b1b70d824f..f6dc9764da86 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3,7 +3,7 @@\n \n #include <generated/utsrelease.h>\n #include <linux/crash_dump.h>\n-#include <linux/net/intel/libie/pctype.h>\n+#include <linux/intel/libie/pctype.h>\n #include <linux/if_bridge.h>\n #include <linux/if_macvlan.h>\n #include <linux/module.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\nindex 26bb7bffe361..9d0cd6aabdcb 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n@@ -5,7 +5,7 @@\n #define _I40E_PROTOTYPE_H_\n \n #include <linux/ethtool.h>\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include \"i40e_debug.h\"\n #include \"i40e_type.h\"\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex cc0b9efc2637..ee8c8c1ac3aa 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2,8 +2,8 @@\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/bpf_trace.h>\n-#include <linux/net/intel/libie/pctype.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/pctype.h>\n+#include <linux/intel/libie/rx.h>\n #include <linux/prefetch.h>\n #include <linux/sctp.h>\n #include <net/mpls.h>\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex 1e5fd63d47f4..e630493e9139 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -4,7 +4,7 @@\n #ifndef _I40E_TXRX_H_\n #define _I40E_TXRX_H_\n \n-#include <linux/net/intel/libie/pctype.h>\n+#include <linux/intel/libie/pctype.h>\n #include <net/xdp.h>\n #include \"i40e_type.h\"\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\nindex f558b45725c8..a03ecddfb956 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n@@ -4,7 +4,7 @@\n #ifndef _I40E_VIRTCHNL_PF_H_\n #define _I40E_VIRTCHNL_PF_H_\n \n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include <linux/netdevice.h>\n #include \"i40e_type.h\"\n \ndiff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex a87e0c6d4017..80b9a70ee3e1 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -37,7 +37,7 @@\n #include <net/net_shaper.h>\n \n #include \"iavf_type.h\"\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include \"iavf_txrx.h\"\n #include \"iavf_fdir.h\"\n #include \"iavf_adv_rss.h\"\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h b/drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h\nindex 0482c9ce9b9c..12e84e1e971b 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h\n@@ -4,7 +4,7 @@\n #ifndef _IAVF_ADMINQ_CMD_H_\n #define _IAVF_ADMINQ_CMD_H_\n \n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n /* This header file defines the iavf Admin Queue commands and is shared between\n * iavf Firmware and Software.\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c\nindex 614a886bca99..9bc8bdc339c7 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_common.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_common.c\n@@ -1,7 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include <linux/bitfield.h>\n #include \"iavf_type.h\"\n #include \"iavf_adminq.h\"\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 4b0fc8f354bc..d7b577b8c965 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -1,7 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n #include <net/netdev_lock.h>\n \n #include \"iavf.h\"\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_prototype.h b/drivers/net/ethernet/intel/iavf/iavf_prototype.h\nindex 7f9f9dbf959a..a3348b063723 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_prototype.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_prototype.h\n@@ -6,7 +6,7 @@\n \n #include \"iavf_type.h\"\n #include \"iavf_alloc.h\"\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n \n /* Prototypes for shared code functions that are not in\n * the standard function pointer structures. These are\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\nindex 363c42bf3dcf..275b11dd0c60 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n@@ -2,7 +2,7 @@\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n #include <linux/bitfield.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n #include <linux/prefetch.h>\n \n #include \"iavf.h\"\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.h b/drivers/net/ethernet/intel/iavf/iavf_txrx.h\nindex df49b0b1d54a..bc8a6068461d 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.h\n@@ -4,7 +4,7 @@\n #ifndef _IAVF_TXRX_H_\n #define _IAVF_TXRX_H_\n \n-#include <linux/net/intel/libie/pctype.h>\n+#include <linux/intel/libie/pctype.h>\n \n /* Interrupt Throttling and Rate Limiting Goodies */\n #define IAVF_DEFAULT_IRQ_WORK 256\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_types.h b/drivers/net/ethernet/intel/iavf/iavf_types.h\nindex a095855122bf..270bc35f933d 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_types.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_types.h\n@@ -4,9 +4,7 @@\n #ifndef _IAVF_TYPES_H_\n #define _IAVF_TYPES_H_\n \n-#include \"iavf_types.h\"\n-\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include <linux/ptp_clock_kernel.h>\n \n /* structure used to queue PTP commands for processing */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 88156082a41d..d74512205203 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -1,7 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n \n #include \"iavf.h\"\n #include \"iavf_ptp.h\"\ndiff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 147aaee192a7..623659b565bd 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -36,7 +36,7 @@\n #include <linux/bpf.h>\n #include <linux/btf.h>\n #include <linux/auxiliary_bus.h>\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include <linux/cpu_rmap.h>\n #include <linux/dim.h>\n #include <linux/gnss.h>\ndiff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 859e9c66f3e7..b2685ebd37d6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -4,7 +4,7 @@\n #ifndef _ICE_ADMINQ_CMD_H_\n #define _ICE_ADMINQ_CMD_H_\n \n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n /* This header file defines the Admin Queue commands, error codes and\n * descriptor format. It is shared between Firmware and Software.\ndiff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex eadb1e3d12b3..01e4dd3b20f2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -2,7 +2,7 @@\n /* Copyright (c) 2019, Intel Corporation. */\n \n #include <net/xdp_sock_drv.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n #include \"ice_base.h\"\n #include \"ice_lib.h\"\n #include \"ice_dcb_lib.h\"\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h\nindex e700ac0dc347..ff6393e9be0c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.h\n+++ b/drivers/net/ethernet/intel/ice/ice_common.h\n@@ -11,7 +11,7 @@\n #include \"ice_nvm.h\"\n #include \"ice_flex_pipe.h\"\n #include \"ice_parser.h\"\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include \"ice_switch.h\"\n #include \"ice_fdir.h\"\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h\nindex 6c6cdc8addb1..7323e26afc0b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flow.h\n+++ b/drivers/net/ethernet/intel/ice/ice_flow.h\n@@ -4,7 +4,7 @@\n #ifndef _ICE_FLOW_H_\n #define _ICE_FLOW_H_\n \n-#include <linux/net/intel/libie/pctype.h>\n+#include <linux/intel/libie/pctype.h>\n \n #include \"ice_flex_type.h\"\n #include \"ice_parser.h\"\ndiff --git a/drivers/net/ethernet/intel/ice/ice_idc_int.h b/drivers/net/ethernet/intel/ice/ice_idc_int.h\nindex 17dbfcfb6a2a..abe91f313441 100644\n--- a/drivers/net/ethernet/intel/ice/ice_idc_int.h\n+++ b/drivers/net/ethernet/intel/ice/ice_idc_int.h\n@@ -4,8 +4,8 @@\n #ifndef _ICE_IDC_INT_H_\n #define _ICE_IDC_INT_H_\n \n-#include <linux/net/intel/iidc_rdma.h>\n-#include <linux/net/intel/iidc_rdma_ice.h>\n+#include <linux/intel/iidc_rdma.h>\n+#include <linux/intel/iidc_rdma_ice.h>\n \n struct ice_pf;\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex ad76768a4232..1994a26be3af 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -7,7 +7,7 @@\n #include <linux/netdevice.h>\n #include <linux/prefetch.h>\n #include <linux/bpf_trace.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n #include <net/libeth/xdp.h>\n #include <net/dsfield.h>\n #include <net/mpls.h>\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c\nindex 956da38d63b0..25c00c894f8f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c\n@@ -2,7 +2,7 @@\n /* Copyright (c) 2019, Intel Corporation. */\n \n #include <linux/filter.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n #include <net/libeth/xdp.h>\n \n #include \"ice_txrx_lib.h\"\ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex 6a2ec8389a8f..b3dc978e0845 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -17,7 +17,7 @@\n #include \"ice_protocol_type.h\"\n #include \"ice_sbq_cmd.h\"\n #include \"ice_vlan_mode.h\"\n-#include <linux/net/intel/libie/fwlog.h>\n+#include <linux/intel/libie/fwlog.h>\n #include <linux/wait.h>\n #include <net/dscp.h>\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h\nindex 7a9c75d1d07c..c520e22e3d0a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n@@ -10,7 +10,7 @@\n #include <linux/mutex.h>\n #include <linux/pci.h>\n #include <net/devlink.h>\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include \"ice_type.h\"\n #include \"ice_flow.h\"\n #include \"virt/fdir.h\"\ndiff --git a/drivers/net/ethernet/intel/ice/virt/virtchnl.h b/drivers/net/ethernet/intel/ice/virt/virtchnl.h\nindex 71bb456e2d71..f7f909424098 100644\n--- a/drivers/net/ethernet/intel/ice/virt/virtchnl.h\n+++ b/drivers/net/ethernet/intel/ice/virt/virtchnl.h\n@@ -7,7 +7,7 @@\n #include <linux/types.h>\n #include <linux/bitops.h>\n #include <linux/if_ether.h>\n-#include <linux/avf/virtchnl.h>\n+#include <linux/intel/virtchnl.h>\n #include \"ice_vf_lib.h\"\n \n /* Restrict number of MAC Addr and VLAN that non-trusted VF can programmed */\ndiff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h\nindex dd2718bbd8bd..78e55baf4600 100644\n--- a/drivers/net/ethernet/intel/idpf/idpf.h\n+++ b/drivers/net/ethernet/intel/idpf/idpf.h\n@@ -21,10 +21,10 @@ struct idpf_rss_data;\n #include <linux/ethtool_netlink.h>\n #include <net/gro.h>\n \n-#include <linux/net/intel/iidc_rdma.h>\n-#include <linux/net/intel/iidc_rdma_idpf.h>\n+#include <linux/intel/iidc_rdma.h>\n+#include <linux/intel/iidc_rdma_idpf.h>\n+#include <linux/intel/virtchnl2.h>\n \n-#include \"virtchnl2.h\"\n #include \"idpf_txrx.h\"\n #include \"idpf_controlq.h\"\n \ndiff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h\nindex 5dcb14008e31..e8ca0186ac01 100644\n--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h\n+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h\n@@ -13,7 +13,7 @@\n #include <net/xdp.h>\n \n #include \"idpf_lan_txrx.h\"\n-#include \"virtchnl2_lan_desc.h\"\n+#include <linux/intel/virtchnl2_lan_desc.h>\n \n #define IDPF_LARGE_MAX_Q\t\t\t256\n #define IDPF_MAX_Q\t\t\t\t16\ndiff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.h b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.h\nindex fe065911ad5a..762b477e019c 100644\n--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.h\n+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.h\n@@ -4,7 +4,7 @@\n #ifndef _IDPF_VIRTCHNL_H_\n #define _IDPF_VIRTCHNL_H_\n \n-#include \"virtchnl2.h\"\n+#include <linux/intel/virtchnl2.h>\n \n #define IDPF_VC_XN_DEFAULT_TIMEOUT_MSEC\t(60 * 1000)\n #define IDPF_VC_XN_IDX_M\t\tGENMASK(7, 0)\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 61f2ef67defd..94e00ab96692 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -7,7 +7,7 @@\n #include <linux/types.h>\n #include <linux/mdio.h>\n #include <linux/netdevice.h>\n-#include <linux/net/intel/libie/fwlog.h>\n+#include <linux/intel/libie/fwlog.h>\n #include \"ixgbe_type_e610.h\"\n \n /* Device IDs */\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h\nindex ff8d640a50b1..4bcdebc37eb1 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h\n@@ -4,7 +4,7 @@\n #ifndef _IXGBE_TYPE_E610_H_\n #define _IXGBE_TYPE_E610_H_\n \n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n #define BYTES_PER_DWORD\t4\n \ndiff --git a/drivers/net/ethernet/intel/libie/adminq.c b/drivers/net/ethernet/intel/libie/adminq.c\nindex 7b4ff479e7e5..5a3ea8eb45c2 100644\n--- a/drivers/net/ethernet/intel/libie/adminq.c\n+++ b/drivers/net/ethernet/intel/libie/adminq.c\n@@ -2,7 +2,7 @@\n /* Copyright (C) 2025 Intel Corporation */\n \n #include <linux/module.h>\n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n static const char * const libie_aq_str_arr[] = {\n #define LIBIE_AQ_STR(x)\t\t\t\t\t\\\ndiff --git a/drivers/net/ethernet/intel/libie/fwlog.c b/drivers/net/ethernet/intel/libie/fwlog.c\nindex f39cc11cb7c5..01ff0eaa357b 100644\n--- a/drivers/net/ethernet/intel/libie/fwlog.c\n+++ b/drivers/net/ethernet/intel/libie/fwlog.c\n@@ -4,7 +4,7 @@\n #include <linux/debugfs.h>\n #include <linux/export.h>\n #include <linux/fs.h>\n-#include <linux/net/intel/libie/fwlog.h>\n+#include <linux/intel/libie/fwlog.h>\n #include <linux/pci.h>\n #include <linux/random.h>\n #include <linux/vmalloc.h>\ndiff --git a/drivers/net/ethernet/intel/libie/rx.c b/drivers/net/ethernet/intel/libie/rx.c\nindex 6fda656afa9c..e163b8a66aea 100644\n--- a/drivers/net/ethernet/intel/libie/rx.c\n+++ b/drivers/net/ethernet/intel/libie/rx.c\n@@ -4,7 +4,7 @@\n #define DEFAULT_SYMBOL_NAMESPACE\t\"LIBIE\"\n \n #include <linux/export.h>\n-#include <linux/net/intel/libie/rx.h>\n+#include <linux/intel/libie/rx.h>\n \n /* O(1) converting i40e/ice/iavf's 8/10-bit hardware packet type to a parsed\n * bitfield struct.\ndiff --git a/include/linux/net/intel/i40e_client.h b/include/linux/intel/i40e_client.h\nsimilarity index 100%\nrename from include/linux/net/intel/i40e_client.h\nrename to include/linux/intel/i40e_client.h\ndiff --git a/include/linux/net/intel/iidc_rdma.h b/include/linux/intel/iidc_rdma.h\nsimilarity index 100%\nrename from include/linux/net/intel/iidc_rdma.h\nrename to include/linux/intel/iidc_rdma.h\ndiff --git a/include/linux/net/intel/iidc_rdma_ice.h b/include/linux/intel/iidc_rdma_ice.h\nsimilarity index 100%\nrename from include/linux/net/intel/iidc_rdma_ice.h\nrename to include/linux/intel/iidc_rdma_ice.h\ndiff --git a/include/linux/net/intel/iidc_rdma_idpf.h b/include/linux/intel/iidc_rdma_idpf.h\nsimilarity index 100%\nrename from include/linux/net/intel/iidc_rdma_idpf.h\nrename to include/linux/intel/iidc_rdma_idpf.h\ndiff --git a/include/linux/net/intel/libie/adminq.h b/include/linux/intel/libie/adminq.h\nsimilarity index 100%\nrename from include/linux/net/intel/libie/adminq.h\nrename to include/linux/intel/libie/adminq.h\ndiff --git a/include/linux/net/intel/libie/fwlog.h b/include/linux/intel/libie/fwlog.h\nsimilarity index 98%\nrename from include/linux/net/intel/libie/fwlog.h\nrename to include/linux/intel/libie/fwlog.h\nindex 7273c78c826b..de3d7e89b768 100644\n--- a/include/linux/net/intel/libie/fwlog.h\n+++ b/include/linux/intel/libie/fwlog.h\n@@ -4,7 +4,7 @@\n #ifndef _LIBIE_FWLOG_H_\n #define _LIBIE_FWLOG_H_\n \n-#include <linux/net/intel/libie/adminq.h>\n+#include <linux/intel/libie/adminq.h>\n \n /* Only a single log level should be set and all log levels under the set value\n * are enabled, e.g. if log level is set to LIBIE_FW_LOG_LEVEL_VERBOSE, then all\ndiff --git a/include/linux/net/intel/libie/pctype.h b/include/linux/intel/libie/pctype.h\nsimilarity index 100%\nrename from include/linux/net/intel/libie/pctype.h\nrename to include/linux/intel/libie/pctype.h\ndiff --git a/include/linux/net/intel/libie/rx.h b/include/linux/intel/libie/rx.h\nsimilarity index 100%\nrename from include/linux/net/intel/libie/rx.h\nrename to include/linux/intel/libie/rx.h\ndiff --git a/include/linux/avf/virtchnl.h b/include/linux/intel/virtchnl.h\nsimilarity index 100%\nrename from include/linux/avf/virtchnl.h\nrename to include/linux/intel/virtchnl.h\ndiff --git a/drivers/net/ethernet/intel/idpf/virtchnl2.h b/include/linux/intel/virtchnl2.h\nsimilarity index 100%\nrename from drivers/net/ethernet/intel/idpf/virtchnl2.h\nrename to include/linux/intel/virtchnl2.h\ndiff --git a/drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h b/include/linux/intel/virtchnl2_lan_desc.h\nsimilarity index 100%\nrename from drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h\nrename to include/linux/intel/virtchnl2_lan_desc.h\n", "prefixes": [ "iwl-next", "v5", "01/15" ] }