From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4B9F4A04B7; Tue, 13 Oct 2020 21:20:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A08B1DA95; Tue, 13 Oct 2020 21:20:45 +0200 (CEST) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by dpdk.org (Postfix) with ESMTP id 0A8BD1DA92 for ; Tue, 13 Oct 2020 21:20:43 +0200 (CEST) Received: by mail-io1-f65.google.com with SMTP id q25so1029330ioh.4 for ; Tue, 13 Oct 2020 12:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=864noTElbKXVrIKv6X3w9pl2x3xT2DqbwnHavsG7kDk=; b=H9mwn/ZrX0g6bxbrWA/q5TMCMNJ6HjUf6W6Phk3WEFr/FHjpvXvb+xBB8DpBg1TBQt aaqZJQSS+EgmA6ZPz5g/Mjv95CSrU6gny/nosb0G4KfAtsVuwvuEOQfIPUmHIbsC5fXN bZGU0/WPDYgBU/gpXv3NpFWOel/QSi0toJtC4/FtyZj9Qn3IihyEtnPk0BL7nrvXsTIp 0dr2eyHOFNoNxgllhmfj+R266FchAITttjY6zrr0N5mp2rlngIYd5G3sfG9P5rtZrk7N zv9zkNZcB0H9nSJ6Zui0S5v3rrwMXnpY3yR08Pekku7V4pDiKOWKKC27OD006LQ+TvDn COxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=864noTElbKXVrIKv6X3w9pl2x3xT2DqbwnHavsG7kDk=; b=N5dJCb9c160LKuQHkrZ0+3wVTVjbQERFPgCX6XgPU8Pnx3nqA6HqucqQIdyMQMKcyf MpHJV43OH1ma59qkY0G25CWprJFAl9+K0f9axnSIgngNc5k5sJn4o1yqWGNk0scEls4e OyUmCwyqk/SgQCH25+N8MdC1FjRnyAMFcpAwQqI5l+Uq+yAZPwDuY+IBv7Z8bw9cPAEe w5okwVTgevQNQCgbhIWZmelWGNprQFClVOwKseMMcpsAX+FpdtkTM9YWWWoHBhSCdGN1 1tShQ7Y57yH54pZmvTyx0CWfLegw/62HVLFFmRv2kbIPsW44n9Eg0bmIaVdU2Zg/mN24 sFgQ== X-Gm-Message-State: AOAM533uykEz4OsGaI7G9Z6oTgPVT/j0UZh/LQzO1G1ccQH+coTU2jjO RhHt9NOeHViq92wKNsKHrn7VjN7DUIjxdNhd0xY= X-Google-Smtp-Source: ABdhPJw6WFK2MJTTMpTyjac3rzb1OEPdozQCAge6e6TMAD7ULEb/IPNEx9nzZ9vltCSUUx/E+OB0yt1HBE7vCtHT+N8= X-Received: by 2002:a02:ca48:: with SMTP id i8mr293261jal.133.1602616841348; Tue, 13 Oct 2020 12:20:41 -0700 (PDT) MIME-Version: 1.0 References: <1601929674-27662-1-git-send-email-timothy.mcdaniel@intel.com> <1601929674-27662-3-git-send-email-timothy.mcdaniel@intel.com> In-Reply-To: From: Jerin Jacob Date: Wed, 14 Oct 2020 00:50:25 +0530 Message-ID: To: Pavan Nikhilesh Bhagavatula Cc: "Van Haaren, Harry" , "McDaniel, Timothy" , Jerin Jacob Kollanukkaran , "Kovacevic, Marko" , Ori Kam , "Richardson, Bruce" , "Nicolau, Radu" , Akhil Goyal , "Kantecki, Tomasz" , Sunil Kumar Kori , "dev@dpdk.org" , "Carrillo, Erik G" , "Eads, Gage" , "hemant.agrawal@nxp.com" Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v2 2/2] eventdev: update app and examples for new eventdev ABI X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Oct 13, 2020 at 12:39 AM Pavan Nikhilesh Bhagavatula wrote: > > >> Subject: [PATCH v2 2/2] eventdev: update app and examples for new > >eventdev ABI > >> > >> Several data structures and constants changed, or were added, > >> in the previous patch. This commit updates the dependent > >> apps and examples to use the new ABI. > >> > >> Signed-off-by: Timothy McDaniel > > With fixes to trace framework > Acked-by: Pavan Nikhilesh @McDaniel, Timothy , The series has apply issues[1], Could you send the final version with Ack of Harry and Pavan. I will merge this series for RC1 and Let's move DLB PMD driver updates to RC2. [1] [for-main]dell[dpdk-next-eventdev] $ date && /home/jerin/config/scripts/build_each_patch.sh /tmp/r/ && date Wed Oct 14 12:41:19 AM IST 2020 HEAD is now at b7a8eea2c app/eventdev: enable fast free offload meson build test Applying: eventdev: eventdev: express DLB/DLB2 PMD constraints Using index info to reconstruct a base tree... M drivers/event/dpaa2/dpaa2_eventdev.c M drivers/event/octeontx/ssovf_evdev.c M drivers/event/octeontx2/otx2_evdev.c M lib/librte_eventdev/rte_event_eth_tx_adapter.c M lib/librte_eventdev/rte_eventdev.c Falling back to patching base and 3-way merge... Auto-merging lib/librte_eventdev/rte_eventdev.c CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev.c Auto-merging lib/librte_eventdev/rte_event_eth_tx_adapter.c Auto-merging drivers/event/octeontx2/otx2_evdev.c Auto-merging drivers/event/octeontx/ssovf_evdev.c Auto-merging drivers/event/dpaa2/dpaa2_eventdev.c Recorded preimage for 'lib/librte_eventdev/rte_eventdev.c' error: Failed to merge in the changes. Patch failed at 0001 eventdev: eventdev: express DLB/DLB2 PMD constraints hint: Use 'git am --show-current-patch=diff' to see the failed patch 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". git am failed /tmp/r//v2-1-2-eventdev-eventdev-express-DLB-DLB2-PMD-constraints HEAD is now at b7a8eea2c app/eventdev: enable fast free offload Wed Oct 14 12:41:19 AM IST 2020