From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 354952C2B for ; Fri, 5 Oct 2018 11:08:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Oct 2018 02:08:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,343,1534834800"; d="scan'208";a="94853249" Received: from aburakov-mobl1.ger.corp.intel.com (HELO [10.252.17.112]) ([10.252.17.112]) by fmsmga004.fm.intel.com with ESMTP; 05 Oct 2018 02:04:49 -0700 To: Ferruh Yigit , Thomas Monjalon Cc: dev@dpdk.org, John McNamara , Marko Kovacevic References: <98f283ce5bcf8973c5c08d13f4fbfe375ded6ebf.1535368896.git.anatoly.burakov@intel.com> <102589449.7KdqRJ0jb8@xps> <1885384.20xM5LhNRE@xps> From: "Burakov, Anatoly" Message-ID: <81e53478-1181-427f-1978-690401c85856@intel.com> Date: Fri, 5 Oct 2018 10:04:49 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] mem: store memory mode flags in shared config 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: , X-List-Received-Date: Fri, 05 Oct 2018 09:08:16 -0000 On 04-Oct-18 11:46 AM, Ferruh Yigit wrote: > On 10/4/2018 10:18 AM, Thomas Monjalon wrote: >> 04/10/2018 11:17, Burakov, Anatoly: >>> On 03-Oct-18 11:05 PM, Thomas Monjalon wrote: >>>> 20/09/2018 17:41, Anatoly Burakov: >>>>> Currently, command-line switches for legacy mem mode or single-file >>>>> segments mode are only stored in internal config. This leads to a >>>>> situation where these flags have to always match between primary >>>>> and secondary, which is bad for usability. >>>>> >>>>> Fix this by storing these flags in the shared config as well, so >>>>> that secondary process can know if the primary was launched in >>>>> single-file segments or legacy mem mode. >>>>> >>>>> This bumps the EAL ABI, however there's an EAL deprecation notice >>>>> already in place[1] for a different feature, so that's OK. >>>>> >>>>> [1] http://patches.dpdk.org/patch/43502/ >>>>> >>>>> Signed-off-by: Anatoly Burakov >>>>> --- >>>>> >>>>> Notes: >>>>> v2: >>>>> - Added documentation on ABI break >>>>> >>>>> doc/guides/rel_notes/rel_description.rst | 5 +++++ >>>> >>>> Removed change in this file (dup of release note). >>>> >>>>> doc/guides/rel_notes/release_18_11.rst | 6 +++++- >>>>> .../common/include/rte_eal_memconfig.h | 4 ++++ >>>>> lib/librte_eal/linuxapp/eal/Makefile | 2 +- >>>>> lib/librte_eal/linuxapp/eal/eal.c | 20 +++++++++++++++++++ >>>>> lib/librte_eal/meson.build | 2 +- >>>>> 6 files changed, 36 insertions(+), 3 deletions(-) >>>> >>>> Applied (without extra note), thanks. >>>> >>> >>> This will probably break external mem patches due to conflict in release >>> notes. Should i respin? >> >> No, conflicts in release notes are usual. I manage such conflict myself. > > It is common to have conflict in release notes and as Thomas said we resolve it > manually but now this is causing problem in automated per patch tests because > patch can't be applied. > > We should think about a way to prevent these conflicts. > How about just ignore them? 'git status' will show you which particular files cause conflicts. if it's anything in the doc/ directory, it's safe to 'git add' those files and proceed with rebase/apply, no? -- Thanks, Anatoly