> -----Original Message-----
> From: Bruce Richardson <bruce.richard...@intel.com>
> Sent: Tuesday, October 3, 2023 10:31 PM
> To: dev@dpdk.org
> Cc: Bruce Richardson <bruce.richard...@intel.com>; Jerin Jacob Kollanukkaran
> <jer...@marvell.com>; Naga Harish K S V <s.v.naga.haris...@intel.com>
> Subject: [EXT] [PATCH] eventdev: drop custom OS defines
>
> External Email
>
> ----------------------------------------------------------------------
> The eventdev library doesn't need to put in place its own defines for Linux
> and
> BSD. There are already defines for the OS environment in rte_config.h that can
> be re-used, but since these are just for identifying Linux/non-Linux, we can
> just
> check for the standard define '__linux__' instead.
>
> Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
Could you fix the following merge conflict
Also, change subject as eventdev/eth_rx:
[for-main]dell[dpdk-next-eventdev] $ git pw series apply 29725
Failed to apply patch:
Applying: eventdev: drop custom OS defines
Using index info to reconstruct a base tree...
M lib/eventdev/rte_event_eth_rx_adapter.c
Falling back to patching base and 3-way merge...
Auto-merging lib/eventdev/rte_event_eth_rx_adapter.c
CONFLICT (content): Merge conflict in lib/eventdev/rte_event_eth_rx_adapter.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 eventdev: drop custom OS defines
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[for-main]dell[dpdk-next-eventdev] $ git diff
diff --cc lib/eventdev/rte_event_eth_rx_adapter.c
index ea7106a1fe,9090e5fbb7..0000000000
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@@ -4,8 -4,7 +4,12 @@@
*/
#include <ctype.h>
#include <stdlib.h>
++<<<<<<< HEAD
+#include <pthread.h>
+#if defined(LINUX)
++=======
+ #if defined(__linux__)
++>>>>>>> eventdev: drop custom OS defines
