[PATCH v2 0/8] remove non-base files from base folders

[Bruce Richardson]

On Tue, Aug 25, 2026 at 05:54:51PM +0200, David Marchand wrote:
> On Tue, 25 Aug 2026 at 17:16, Bruce Richardson
> <bruce.richardson at intel.com> wrote:
> >
> > 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%)
> 
> Looks like some update is missing in net/ice (reference to iavf_impl.c).
> 

Yes, patch 4 is missing a one-line update to ice/meson.build, reported by
CI. Will fix in v3 shortly.

> Once fixed, for the series:
> Acked-by: David Marchand <david.marchand at redhat.com>
> 
> 
> -- 
> David Marchand
>