From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACEF7C61DB9 for ; Tue, 25 Aug 2026 15:16:02 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E438402EB; Tue, 25 Aug 2026 17:16:01 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mails.dpdk.org (Postfix) with ESMTP id ABE5E400D7 for ; Tue, 25 Aug 2026 17:15:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1787670960; x=1819206960; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6mBJN88Y1x47cLvgvPUqGJ2YRooIN/uRWxXBxQ0leaQ=; b=I52GrpKkQePJY2h6Eu4BbkSXQbkTKUFC435mWbWYMl1RbPG94NPxKZ1n FbJpVdTKqNiiM602wriDwC9eAxATEznObYeGyX2kVYDR0A4nHS3Pt0ssf O2EevsWfymceZhek2qk9ERbI3htOTSJwFkfxbnHUqJICUe10EfP9QaRwu tVctHX28aQJiyz9imxf+tbv2wXDDdGZNQW4tNuW9MRK4pgN9hU9eEEbVW IPNW/hoKdqAKawtaH4DfqSUderceFbL49PMcrlvOaEZuN2RN9A0uC34eP hqx/1M9JLaLL2ClqvgKhRTEo8nP7Ad6wd7Y9WtxVIFzJWyw4PUMoCod1C g==; X-CSE-ConnectionGUID: 8opyNOorQs+Pg8iQvUY4zQ== X-CSE-MsgGUID: MfHfDU4+RrunTdksquDFiQ== X-IronPort-AV: E=McAfee;i="6800,10657,11885"; a="88270665" X-IronPort-AV: E=Sophos;i="6.25,242,1779174000"; d="scan'208";a="88270665" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2026 08:15:40 -0700 X-CSE-ConnectionGUID: UjmrAIduSQGKlrteNOIg4Q== X-CSE-MsgGUID: AjIFZlGfQsWYaNOZ2nI4ug== X-ExtLoop1: 1 Received: from silpixa00401385.ir.intel.com ([10.20.224.226]) by fmviesa003.fm.intel.com with ESMTP; 25 Aug 2026 08:15:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH v2 0/8] remove non-base files from base folders Date: Tue, 25 Aug 2026 16:15:15 +0100 Message-ID: <20260825151533.535102-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260814153755.940302-1-bruce.richardson@intel.com> References: <20260814153755.940302-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The base code folders for intel drivers contained the compatibility *_osdep.h files as well as meson.build files, both of which are editable via regular DPDK patches. Although the DPDK documentation allows this arrangement, I (for one) have always found it a little awkward and confusing to have editable and non-editable files mixed. For Intel drivers only, this patchset moves osdep file out of base, and merges the (in most cases trivial) meson.build files from base into the main driver meson.build file. After this patch we have a clean separation - any files in base, with no exceptions, should be updated only via snapshot update patchsets from Intel. All files outside base are normal DPDK files that can be modified by any patch. v2: remove unnecessary edits to ixgbe files, keeping the "base/" prefix on includes. Bruce Richardson (8): net/e1000: move editable files out of base folder net/fm10k: move editable files out of base folder net/i40e: move editable files out of base folder net/iavf: move editable files out of base folder net/ice: move editable files out of base folder net/idpf: move editable files out of base folder net/ixgbe: move editable files out of base folder net/ice: consolidate the sources list drivers/net/intel/cpfl/cpfl_actions.h | 2 +- drivers/net/intel/cpfl/cpfl_controlq.h | 2 +- drivers/net/intel/e1000/base/README | 9 --- drivers/net/intel/e1000/base/meson.build | 24 ------- .../net/intel/e1000/{base => }/e1000_osdep.c | 0 .../net/intel/e1000/{base => }/e1000_osdep.h | 4 +- drivers/net/intel/e1000/em_rxtx.c | 2 +- drivers/net/intel/e1000/igc_ethdev.h | 2 +- drivers/net/intel/e1000/meson.build | 22 ++++++- drivers/net/intel/fm10k/base/meson.build | 11 ---- .../net/intel/fm10k/{base => }/fm10k_osdep.h | 4 +- drivers/net/intel/fm10k/meson.build | 9 ++- drivers/net/intel/i40e/base/README | 8 --- drivers/net/intel/i40e/base/meson.build | 12 ---- .../net/intel/i40e/{base => }/i40e_osdep.h | 4 +- drivers/net/intel/i40e/meson.build | 10 ++- drivers/net/intel/iavf/base/README | 8 --- .../iavf/{base/iavf_impl.c => iavf_osdep.c} | 0 .../net/intel/iavf/{base => }/iavf_osdep.h | 2 + drivers/net/intel/iavf/meson.build | 2 +- drivers/net/intel/ice/base/README | 8 --- drivers/net/intel/ice/base/meson.build | 51 --------------- drivers/net/intel/ice/{base => }/ice_osdep.h | 4 +- drivers/net/intel/ice/meson.build | 62 ++++++++++++++++--- drivers/net/intel/idpf/base/README | 8 --- drivers/net/intel/idpf/base/meson.build | 7 --- .../net/intel/idpf/{base => }/idpf_osdep.h | 4 +- drivers/net/intel/idpf/idpf_ptp.h | 2 +- drivers/net/intel/idpf/meson.build | 5 +- drivers/net/intel/ixgbe/base/README | 9 --- drivers/net/intel/ixgbe/base/meson.build | 19 ------ drivers/net/intel/ixgbe/ixgbe_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_flow.c | 2 +- .../net/intel/ixgbe/{base => }/ixgbe_osdep.h | 2 + drivers/net/intel/ixgbe/meson.build | 17 ++++- 35 files changed, 138 insertions(+), 201 deletions(-) delete mode 100644 drivers/net/intel/e1000/base/meson.build rename drivers/net/intel/e1000/{base => }/e1000_osdep.c (100%) rename drivers/net/intel/e1000/{base => }/e1000_osdep.h (98%) delete mode 100644 drivers/net/intel/fm10k/base/meson.build rename drivers/net/intel/fm10k/{base => }/fm10k_osdep.h (98%) delete mode 100644 drivers/net/intel/i40e/base/meson.build rename drivers/net/intel/i40e/{base => }/i40e_osdep.h (98%) rename drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} (100%) rename drivers/net/intel/iavf/{base => }/iavf_osdep.h (98%) delete mode 100644 drivers/net/intel/ice/base/meson.build rename drivers/net/intel/ice/{base => }/ice_osdep.h (99%) delete mode 100644 drivers/net/intel/idpf/base/meson.build rename drivers/net/intel/idpf/{base => }/idpf_osdep.h (99%) delete mode 100644 drivers/net/intel/ixgbe/base/meson.build rename drivers/net/intel/ixgbe/{base => }/ixgbe_osdep.h (99%) -- 2.53.0