Re: [PATCH v9 03/14] net/sxe: add tx rx setup and data path

Stephen Hemminger
2025-07-16T20:16:48Z

On Wed, 16 Jul 2025 04:29:19 -0400
Jie Liu <liujie5@linkdatatechnology.com> wrote:

> diff --git a/drivers/net/sxe/meson.build.rej b/drivers/net/sxe/meson.build.rej
> new file mode 100644
> index 0000000000..33c394b21f
> --- /dev/null
> +++ b/drivers/net/sxe/meson.build.rej
> @@ -0,0 +1,8 @@
> +diff a/drivers/net/sxe/meson.build b/drivers/net/sxe/meson.build (rejected hunks)
> +@@ -19,4 +27,4 @@ sources = files(
> + includes += include_directories('base')
> + includes += include_directories('pf')
> + includes += include_directories('include/sxe/')
> +-includes += include_directories('include/')
> +\ No newline at end of file
> ++includes += include_directories('include/')

This file should not be in the patch.