From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by dpdk.org (Postfix) with ESMTP id E0DC12E8B for ; Tue, 25 Nov 2014 12:10:15 +0100 (CET) Received: by mail-wi0-f175.google.com with SMTP id l15so8757704wiw.14 for ; Tue, 25 Nov 2014 03:21:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=gIryQI1r3E6/h9KxGmwZfGAeS+bd3xHsoWytg1gWwJM=; b=R/4XzFWwuIUPsl6YgHLfFhGrtvAksae7gzyyAW4VWqxNPbABRQ7q+v/aUX73PyzJf3 0ojhtgsA+1RKSI5+h9PTaZepBs24YKHyrzRTsy++xsf61IYnESu6qIdiyVNnsmP7ZsQD w1WRerCgTwiq1Nf58Nk+wTYrh4+SdXHpcvZiODD3yqSV+RCO+2pfeENcOE6b9MYb0Ugu /+DFZ/6CK16faJiDAHQqxAyYKFQa4/Qr6R2jbqgKXv7ZKleb9NKnobhGJRI7vwGF4q9o O1tuRktCsa0GsvdmAYXx8hQVZReeE8ge0c8AOYtZKSjisFMpFLZQDTfECfTiRG0VRmeQ MxYw== X-Gm-Message-State: ALoCoQlv5XZI9+LARqqrBekSYJxcGahNAwChDHN2F9KCaenWsTQsNC7WpLPstEIIthevzPgZQgdD X-Received: by 10.180.85.198 with SMTP id j6mr29650036wiz.23.1416914467819; Tue, 25 Nov 2014 03:21:07 -0800 (PST) Received: from xps13.localnet (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id ji10sm16054670wid.7.2014.11.25.03.21.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Nov 2014 03:21:07 -0800 (PST) From: Thomas Monjalon To: "Jastrzebski, MichalX K" Date: Tue, 25 Nov 2014 12:20:42 +0100 Message-ID: <4353409.PXLSa3jSZh@xps13> Organization: 6WIND User-Agent: KMail/4.14.2 (Linux/3.17.2-1-ARCH; KDE/4.14.2; x86_64; ; ) In-Reply-To: <60ABE07DBB3A454EB7FAD707B4BB1582138BC9F8@IRSMSX109.ger.corp.intel.com> References: <1416832054-24086-1-git-send-email-declan.doherty@intel.com> <6086797.0Uzru5Vpmk@xps13> <60ABE07DBB3A454EB7FAD707B4BB1582138BC9F8@IRSMSX109.ger.corp.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v8 0/7] link bonding X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 11:10:16 -0000 2014-11-25 10:56, Jastrzebski, MichalX K: > I noticed some problems with applying link bonding mode 4 patches after you applied Declan's patches. > Link bonding mode 4 0001-bond-add-mode-4-support.patch won't apply because of this error: > Checking patch lib/librte_pmd_bond/rte_eth_bond_private.h... > error: while searching for: > #define RTE_BOND_LOG(lvl, msg, ...) \ > RTE_LOG(lvl, PMD, "%s(%d) - " msg "\n", __func__, __LINE__, ##__VA_ARGS__); > > extern const char *pmd_bond_init_valid_arguments[]; > > extern const char *driver_name; > > error: patch failed: lib/librte_pmd_bond/rte_eth_bond_private.h:60 > error: lib/librte_pmd_bond/rte_eth_bond_private.h: patch does not apply > > This happens because originally in Declan's [PATCH v8 6/7] bond: lsc polling support there is a semicolon > at the end of RTE_LOG... line , and my patch is looking for this semicolon also. > So do you want me to send a v6 patch fixing this issue? I can fix this type of conflict by myself but I want you send a v6 because v5 had no commit log. I want also a review from Declan. If it's already done, please add the acked-by in your patch. > The second issue is that Link bonding mode 4 0002-testpmd-add-mode-4-support.patch won't > apply also, because of this error; > error: while searching for: > /* Update number of ports */ > nb_ports = rte_eth_dev_count(); > reconfig(port_id, res->socket); > rte_eth_promiscuous_enable(port_id); > } > > > error: patch failed: app/test-pmd/cmdline.c:3646 > error: app/test-pmd/cmdline.c: patch does not apply > > This is probably because you didn't apply Declan's patch: > [PATCH v8 5/7] testpmd: adding parameter to reconfig Oh yes ! It's totally my fault. The patch has mysteriously disappeared. It's fixed now. Thanks for reporting -- Thomas